Skip to content

Fix NPE if queue returns null in PipeStream #1246

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
merged 2 commits into from
Dec 19, 2016
Merged

Fix NPE if queue returns null in PipeStream #1246

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d38b274
Avoid NullPointerException if value is null
JudgeGregg Oct 19, 2016
5cb04da
Merge remote-tracking branch 'upstream/master'
Nov 16, 2016
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
2 changes: 1 addition & 1 deletion modules/org.restlet/src/org/restlet/engine/io/PipeStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ public int read() throws IOException {

final Integer value = queue.poll(QUEUE_TIMEOUT,
TimeUnit.SECONDS);
this.endReached = (value == -1);

if (value == null) {
throw new IOException(
"Timeout while reading from the queue-based input stream");
} else {
this.endReached = (value == -1);
return value.intValue();
}
} catch (InterruptedException ie) {
Expand Down