Version 14, October 2012

[GpsPrune.git] / tim / prune / function / cache / ManageCacheFunction.java

diff --git a/tim/prune/function/cache/ManageCacheFunction.java b/tim/prune/function/cache/ManageCacheFunction.java
index 65565987529d3885d72a38d12a7b545317e22ed9..04e3cc14e60e5d01a1cb21f02d8cea9b73fb106b 100644 (file)
--- a/tim/prune/function/cache/ManageCacheFunction.java
+++ b/tim/prune/function/cache/ManageCacheFunction.java
@@ -395,18 +395,13 @@ public class ManageCacheFunction extends GenericFunction implements Runnable
                                if (subdir.isDirectory()) {
                                        numDeleted += deleteFilesFrom(subdir, inMaxDays);
                                }
-                               else if (subdir.isFile() && subdir.exists())
+                               else if (subdir.isFile() && subdir.exists() && _TILEFILTER.accept(subdir))
                                {
-                                       boolean isTileFile = _TILEFILTER.accept(subdir);
-                                       boolean isBadFile = !isTileFile && subdir.getName().toLowerCase().endsWith("png");
-                                       if (isTileFile || isBadFile)
+                                       long fileAge = (now - subdir.lastModified()) / 1000 / 60 / 60 / 24;
+                                       if (inMaxDays < 0 || fileAge > inMaxDays)
                                        {
-                                               long fileAge = (now - subdir.lastModified()) / 1000 / 60 / 60 / 24;
-                                               if (inMaxDays < 0 || fileAge > inMaxDays || isBadFile)
-                                               {
-                                                       if (subdir.delete()) {
-                                                               numDeleted++;
-                                                       }
+                                               if (subdir.delete()) {
+                                                       numDeleted++;
                                                }
                                        }
                                }