Skip to content

Fixes #222: Check available() before calling blocking read #237

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
xerial merged 2 commits into from
May 28, 2015
Merged

Fixes #222: Check available() before calling blocking read #237

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16a38b0
Fixes #222: Check whthere available() == 0 before calling blocking re…
xerial May 25, 2015
af428de
Use partial read results to avoid I/O block when reading at the end o…
xerial May 25, 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
Prev Previous commit
Use partial read results to avoid I/O block when reading at the end o… 
…f a stream
  • Loading branch information
@xerial
xerial committed May 25, 2015
commit af428dee61c3468e0db593e26980df2d03444f17
23 changes: 6 additions & 17 deletions msgpack-core/src/main/java/org/msgpack/core/buffer/InputStreamBufferInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,13 @@ public MessageBuffer next() throws IOException {
if(reachedEOF)
return null;

byte[] buffer = null;
int cursor = 0;
while(!reachedEOF && cursor < bufferSize) {
if(buffer == null) {
buffer = new byte[bufferSize];
}

int readLen = -1;
// available() == 0 means, it reached the end of the stream
if(in.available() == 0 ||
(readLen = in.read(buffer, cursor, bufferSize - cursor)) == -1) {
reachedEOF = true;
break;
}
cursor += readLen;
byte[] buffer = new byte[bufferSize];
int readLen = in.read(buffer);
if(readLen == -1) {
reachedEOF = true;
return null;
}

return buffer == null ? null : MessageBuffer.wrap(buffer).slice(0, cursor);
return MessageBuffer.wrap(buffer).slice(0, readLen);
}

@Override
Expand Down