Skip to content

Add a boolean parameter to indicate if Frame is complete #2050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yuting-liu wants to merge 2 commits into from
Closed

Add a boolean parameter to indicate if Frame is complete #2050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e478176
Add a boolean parameter to indicate if Frame is complete
yuting-liu Jan 20, 2023
fbf22e2
Fix test errors
yuting-liu Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions docker-java-api/src/main/java/com/github/dockerjava/api/model/Frame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,18 @@ public class Frame extends DockerObject implements Serializable {

private final byte[] payload;

private final boolean isComplete;

public Frame(StreamType streamType, byte[] payload) {
this.streamType = streamType;
this.payload = payload;
this.isComplete = true;
}

public Frame(StreamType streamType, byte[] payload, boolean isComplete) {
this.streamType = streamType;
this.payload = payload;
this.isComplete = isComplete;
}

public StreamType getStreamType() {
Expand All @@ -28,6 +37,10 @@ public byte[] getPayload() {
return payload;
}

public boolean getIsComplete() {
return isComplete;
}

@Override
public String toString() {
return String.format("%s: %s", streamType, new String(payload).trim());
Expand Down
6 changes: 3 additions & 3 deletions docker-java-core/src/main/java/com/github/dockerjava/core/FramedInputStreamConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ public void accept(DockerHttpClient.Response response) {
return;
}

bytesToRead -= readBytes;
if (readBytes == buffer.length) {
resultCallback.onNext(new Frame(streamType, buffer));
resultCallback.onNext(new Frame(streamType, buffer, bytesToRead == 0));
} else {
resultCallback.onNext(new Frame(streamType, Arrays.copyOf(buffer, readBytes)));
resultCallback.onNext(new Frame(streamType, Arrays.copyOf(buffer, readBytes), bytesToRead == 0));
}
bytesToRead -= readBytes;
} while (bytesToRead > 0);
}
} catch (Exception e) {
Expand Down