Changeset 10570 in josm for trunk

Timestamp:

2016-07-20T09:05:23+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13171 - Do not complain for non-existent files during cache cleanup (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/JCSCacheManager.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -241 +241 @@
 
     private static void deleteCacheFiles(String basePathPart) {
-        Utils.deleteFile(new File(basePathPart + ".key"));
-        Utils.deleteFile(new File(basePathPart + ".data"));
+        Utils.deleteFileIfExists(new File(basePathPart + ".key"));
+        Utils.deleteFileIfExists(new File(basePathPart + ".data"));
     }
 

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

@@ -492 +492 @@
 
     /**
+     * Deletes a file and log a default warning if the file exists but the deletion fails.
+     * @param file file to delete
+     * @return {@code true} if and only if the file does not exist or is successfully deleted; {@code false} otherwise
+     * @since 10569
+     */
+    public static boolean deleteFileIfExists(File file) {
+        if (file.exists()) {
+            return deleteFile(file);
+        } else {
+            return true;
+        }
+    }
+
+    /**
      * Deletes a file and log a default warning if the deletion fails.
      * @param file file to delete