Changeset 11320 in josm for trunk/src/org

Timestamp:

2016-11-26T23:45:05+01:00 (8 years ago)

Author:

wiktorn

Message:

Better handle of null in readBytesFromStream.

See: #14033

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -1366 +1366 @@
      *
      * @param stream input stream
-     * @return byte array of data in input stream
+     * @return byte array of data in input stream or null if stream is null
      * @throws IOException if any I/O error occurs
      */
     public static byte[] readBytesFromStream(InputStream stream) throws IOException {
+        if (stream == null) {
+            return null;
+        }
         try {
             ByteArrayOutputStream bout = new ByteArrayOutputStream(stream.available());