You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ch...@apache.org on 2013/10/08 23:10:29 UTC

svn commit: r1530425 - /karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java

Author: christophg
Date: Tue Oct  8 21:10:29 2013
New Revision: 1530425

URL: http://svn.apache.org/r1530425
Log:
[KARAF-2505] only delete cache-directory when clean_cache-file exists

Modified:
    karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java

Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java?rev=1530425&r1=1530424&r2=1530425&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java Tue Oct  8 21:10:29 2013
@@ -194,7 +194,7 @@ public class ConfigProperties {
                 if (cleanCacheIndicatorFile.exists()) {
                     cleanCacheIndicatorFile.delete();
                 }
-                File karafCache = Utils.getKarafDirectory(PROP_KARAF_DATA, ENV_KARAF_DATA, new File(karafData, "cache"), true, true);
+                File karafCache = Utils.validateDirectoryExists(new File(karafData, "cache").getPath(), "Invalid cache directory", true, true);
                 Utils.deleteDirectory(karafCache);
             }
         }