Changeset 7028 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-04-29T15:49:32+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9962 - NPE in WMS cache (regression from r7012)

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

@@ -452 +452 @@
 
         String zoom = SystemOfMeasurement.METRIC.getDistText(ll1.greatCircleDistance(ll2));
-        String extension;
-        switch(mimeType) {
-        case "image/jpeg":
-        case "image/jpg":
-            extension = "jpg";
-            break;
-        case "image/png":
-            extension = "png";
-            break;
-        case "image/gif":
-            extension = "gif";
-            break;
-        default:
-            extension = "dat";
+        String extension = "dat";
+        if (mimeType != null) {
+            switch(mimeType) {
+            case "image/jpeg":
+            case "image/jpg":
+                extension = "jpg";
+                break;
+            case "image/png":
+                extension = "png";
+                break;
+            case "image/gif":
+                extension = "gif";
+                break;
+            default:
+                Main.warn("Unrecognized MIME type: "+mimeType);
+            }
         }