killbill-aplcache

osgi: fix cache pruning bug The parent directory was being

3/1/2013 3:23:45 PM

Details

diff --git a/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIService.java b/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIService.java
index 5c0aa07..f6ddfa0 100644
--- a/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIService.java
+++ b/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIService.java
@@ -152,8 +152,7 @@ public class DefaultOSGIService implements OSGIService {
                 for (final File f : files) {
                     if (f.isDirectory()) {
                         deleteDirectory(f, true);
-                    }
-                    if (!f.delete()) {
+                    } else if (!f.delete()) {
                         logger.warn("Unable to delete {}", f.getAbsolutePath());
                     }
                 }
@@ -162,6 +161,8 @@ public class DefaultOSGIService implements OSGIService {
             if (deleteParent) {
                 if (!path.delete()) {
                     logger.warn("Unable to delete {}", path.getAbsolutePath());
+                } else {
+                    logger.info("Deleted recursively {}", path.getAbsolutePath());
                 }
             }
         }