Changeset 11330 in josm for trunk/src/org/openstreetmap/josm/tools/Utils.java

Timestamp:

2016-11-27T17:06:21+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - fix recent issues

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.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 or null if stream is null
+     * @return byte array of data in input stream (empty 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;
+            return new byte[0];
         }
         try {
@@ -1386 +1386 @@
             } while (!finished);
             if (bout.size() == 0)
-                return null;
+                return new byte[0];
             return bout.toByteArray();
         } finally {
-            if (stream != null) {
-                stream.close();
-            }
+            stream.close();
         }
     }