Use single file per bundle in bundle cache by default. (FELIX-3125)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1173319 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java b/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
index 7829e42..73c418e 100644
--- a/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
+++ b/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
@@ -144,7 +144,7 @@
m_refreshCount = 0;
String s = (String) m_configMap.get(BundleCache.CACHE_SINGLEBUNDLEFILE_PROP);
- m_isSingleBundleFile = (s == null) || (!s.equalsIgnoreCase("true")) ? false : true;
+ m_isSingleBundleFile = ((s == null) || s.equalsIgnoreCase("true")) ? true : false;
// Save state.
initialize();
@@ -175,7 +175,7 @@
m_archiveRootDir = archiveRootDir;
String s = (String) m_configMap.get(BundleCache.CACHE_SINGLEBUNDLEFILE_PROP);
- m_isSingleBundleFile = (s == null) || (!s.equalsIgnoreCase("true")) ? false : true;
+ m_isSingleBundleFile = ((s == null) || s.equalsIgnoreCase("true")) ? true : false;
if (m_isSingleBundleFile)
{
diff --git a/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java b/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
index f9c1828..b5a81bf 100644
--- a/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
+++ b/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
@@ -80,7 +80,8 @@
public static final String CACHE_ROOTDIR_PROP = "felix.cache.rootdir";
public static final String CACHE_LOCKING_PROP = "felix.cache.locking";
public static final String CACHE_FILELIMIT_PROP = "felix.cache.filelimit";
- // TODO: KARL/CACHE - Remove this once we migrate the cache format.
+ // TODO: CACHE - This should eventually be removed along with the code
+ // supporting the old multi-file bundle cache format.
public static final String CACHE_SINGLEBUNDLEFILE_PROP = "felix.cache.singlebundlefile";
protected static transient int BUFSIZE = 4096;