Changeset 11320 in josm

Timestamp:

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

Author:

wiktorn

Message:

Better handle of null in readBytesFromStream.

See: #14033

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (2 diffs)

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());

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -162 +164 @@
         assertEquals("<ul></ul>", Utils.joinAsHtmlUnorderedList(Collections.emptyList()));
     }
+
+    /**
+     * Tests if readBytesFromStream handles null streams (might happen when there is no data on error stream)
+     * @throws IOException
+     *
+     */
+    @Test
+    public void testNullStreamForReadBytesFromStream() throws IOException {
+        assertNull("Null on null stream", Utils.readBytesFromStream(null));
+    }
+
 }