Changeset 8308 in josm for trunk/src/org/openstreetmap/josm/tools/Utils.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/tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -378 +378 @@
             Main.warn("Unable to create directory "+out.getPath());
         }
-        for (File f : in.listFiles()) {
-            File target = new File(out, f.getName());
-            if (f.isDirectory()) {
-                copyDirectory(f, target);
-            } else {
-                copyFile(f, target);
+        File[] files = in.listFiles();
+        if (files != null) {
+            for (File f : files) {
+                File target = new File(out, f.getName());
+                if (f.isDirectory()) {
+                    copyDirectory(f, target);
+                } else {
+                    copyFile(f, target);
+                }
             }
         }
@@ -415 +418 @@
         if( path.exists() ) {
             File[] files = path.listFiles();
-            for (File file : files) {
-                if (file.isDirectory()) {
-                    deleteDirectory(file);
-                } else if (!file.delete()) {
-                    Main.warn("Unable to delete file: "+file.getPath());
+            if (files != null) {
+                for (File file : files) {
+                    if (file.isDirectory()) {
+                        deleteDirectory(file);
+                    } else if (!file.delete()) {
+                        Main.warn("Unable to delete file: "+file.getPath());
+                    }
                 }
             }