Fixed potential NPE when a queue returns null in PipeStream. Issue #1246. Reported and contributed by Grégoire Juge.

Author: thboileau

build/tmpl/text/changes.txt

@@ -7,7 +7,8 @@ Changes log
     - Bugs fixed
        - In IE 10 and seq., request without body are sent with an "undefined" body. Issue #1252.
          Reported by Etienne Griette.
-
+       - Fixed potential NPE when a queue returns null in PipeStream. Issue #1246.
+         Reported and contributed by Grégoire Juge. 
 - 2.3.8 (12/10/2016)
     - Bugs fixed
        - Fixed NullPointerException when requesting a Directory with a query string. Issue #1206.

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) {