From d38b2746e72599f7d008c2f7d49b9dd978f31be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Juge?= <gregoire.juge@gmail.com>
Date: Wed, 19 Oct 2016 11:58:06 +0200
Subject: [PATCH] Avoid NullPointerException if value is null

---
 modules/org.restlet/src/org/restlet/engine/io/PipeStream.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/org.restlet/src/org/restlet/engine/io/PipeStream.java b/modules/org.restlet/src/org/restlet/engine/io/PipeStream.java
index 97757f049e..903e67d9c5 100644
--- a/modules/org.restlet/src/org/restlet/engine/io/PipeStream.java
+++ b/modules/org.restlet/src/org/restlet/engine/io/PipeStream.java
@@ -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) {