Changeset 7221 in josm for trunk

Timestamp:

2014-06-08T13:40:35+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10114 - NPE

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -142 +142 @@
         URLConnection openConnection = Utils.openHttpConnection(getCapabilitiesUrl);
         StringBuilder ba = new StringBuilder();
-        
+
         try (
             InputStream inputStream = openConnection.getInputStream();
@@ -224 +224 @@
                 || format.startsWith("image/bmp") && ImageIO.getImageReadersBySuffix("bmp").hasNext();
     }
-    
+
     static boolean imageFormatHasTransparency(final String format) {
-        return format.startsWith("image/png") || format.startsWith("image/gif") 
-                || format.startsWith("image/svg") || format.startsWith("image/tiff");
+        return format != null && (format.startsWith("image/png") || format.startsWith("image/gif")
+                || format.startsWith("image/svg") || format.startsWith("image/tiff"));
     }