Skip to content

FrameReader has problems when buffer is only partially filled #251

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

Merged
alexec merged 2 commits into from
Jun 18, 2015
Merged

FrameReader has problems when buffer is only partially filled #251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f557ea4
Fixing execution on Windows platforms
chrisphe Jun 16, 2015
3cc342c
Merge remote-tracking branch 'upstream/master'
chrisphe Jun 17, 2015
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
33 changes: 22 additions & 11 deletions src/main/java/com/github/dockerjava/core/command/FrameReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,34 @@ private static StreamType streamType(byte streamType) {
*/
public Frame readFrame() throws IOException {
byte[] header = new byte[HEADER_SIZE];
int headerSize = inputStream.read(header);

if (headerSize == -1) {
return null;
}
int actualHeaderSize = 0;

if (headerSize != HEADER_SIZE) {
throw new IOException(String.format("header must be %d bytes long, but was %d", HEADER_SIZE, headerSize));
}
do {
int headerCount = inputStream.read(header, actualHeaderSize, HEADER_SIZE - actualHeaderSize);

if (headerCount == -1) {
return null;
}
actualHeaderSize += headerCount;
} while (actualHeaderSize < HEADER_SIZE);

int payloadSize = ((header[4] & 0xff) << 24) + ((header[5] & 0xff) << 16) + ((header[6] & 0xff) << 8) + (header[7] & 0xff);

byte[] payload = new byte[payloadSize];
int actualPayloadSize = inputStream.read(payload);
if (actualPayloadSize != payloadSize) {
throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize, actualPayloadSize));
}
int actualPayloadSize = 0;

do {
int count = inputStream.read(payload, actualPayloadSize, payloadSize - actualPayloadSize);

if (count == -1) {
if (actualPayloadSize != payloadSize) {
throw new IOException(String.format("payload must be %d bytes long, but was %d", payloadSize, actualPayloadSize));
}
break;
}
actualPayloadSize += count;
} while (actualPayloadSize < payloadSize);

return new Frame(streamType(header[0]), payload);
}
Expand Down