commit 0c66b609b4ccd1832e16d3bc210c5cdeae239134
author Guillaume Nodet <gnodet@apache.org> Wed Sep 09 06:39:23 2009 +0000
committer Guillaume Nodet <gnodet@apache.org> Wed Sep 09 06:39:23 2009 +0000
tree f0a8b19219e370d9130ee2ddee1165019fbb8cd2
parent 4689cc3204eac516a74355678504f4bad4b4567d

FELIX-1455:  OSGi Storage is hardcoded to be data/cache

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@812785 13f79535-47bb-0310-9956-ffa450edef68

karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java

diff --git a/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
index b11dd25..ab2838c 100644
--- a/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
+++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
@@ -168,9 +168,11 @@
 
         processSecurityProperties(configProps);
 
-        File storage = new File(karafBase.getPath(), "data/cache");
-        storage.mkdirs();
-        configProps.setProperty(Constants.FRAMEWORK_STORAGE, storage.getAbsolutePath());
+        if (configProps.getProperty(Constants.FRAMEWORK_STORAGE) == null) {
+            File storage = new File(karafBase.getPath(), "data/cache");
+            storage.mkdirs();
+            configProps.setProperty(Constants.FRAMEWORK_STORAGE, storage.getAbsolutePath());
+        }
 
         try {
             defaultStartLevel = Integer.parseInt(configProps.getProperty(Constants.FRAMEWORK_BEGINNING_STARTLEVEL));