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

Timestamp:

2011-06-29T20:37:48+02:00 (13 years ago)

Author:

jttt

Message:

Fix #6522 NPE when adding wms layer

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java (modified) (2 diffs)

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

@@ -30 +30 @@
 import javax.imageio.ImageIO;
 import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
@@ -230 +229 @@
 
             File projectionDir = new File(cacheDir, projectionEntries.cacheDirectory);
-            Set<String> referencedFiles = new HashSet<String>();
-
-            for (CacheEntry ce: projectionEntries.entries) {
-                referencedFiles.add(ce.filename);
-            }
-
-            for (File file: projectionDir.listFiles()) {
-                if (!referencedFiles.contains(file.getName())) {
-                    file.delete();
+            if (projectionDir.exists()) {
+                Set<String> referencedFiles = new HashSet<String>();
+
+                for (CacheEntry ce: projectionEntries.entries) {
+                    referencedFiles.add(ce.filename);
+                }
+
+                for (File file: projectionDir.listFiles()) {
+                    if (!referencedFiles.contains(file.getName())) {
+                        file.delete();
+                    }
                 }
             }