You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/09/09 08:39:23 UTC
svn commit: r812785 -
/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
Author: gnodet
Date: Wed Sep 9 06:39:23 2009
New Revision: 812785
URL: http://svn.apache.org/viewvc?rev=812785&view=rev
Log:
FELIX-1455: OSGi Storage is hardcoded to be data/cache
Modified:
felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java?rev=812785&r1=812784&r2=812785&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java (original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Main.java Wed Sep 9 06:39:23 2009
@@ -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));