Changeset 8308 in josm for trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

Timestamp:

2015-05-02T00:55:19+02:00 (9 years ago)

Author:

Don-vip

Message:

fix potential NPEs and Sonar issues related to serialization

File:

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

trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

@@ -303 +303 @@
     public static void deleteFileOrDirectory(File f) {
         if (f.isDirectory()) {
-            for (File f1: f.listFiles()) {
-                deleteFileOrDirectory(f1);
+            File[] files = f.listFiles();
+            if (files != null) {
+                for (File f1: files) {
+                    deleteFileOrDirectory(f1);
+                }
             }
         }
@@ -310 +313 @@
             f.delete();
         } catch (Exception e) {
-            log("Warning: Can not delete file "+f.getPath());
+            log("Warning: Can not delete file "+f.getPath()+": "+e.getMessage());
         }
     }