You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2011/09/20 21:40:25 UTC
svn commit: r1173319 - in
/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache:
BundleArchive.java BundleCache.java
Author: rickhall
Date: Tue Sep 20 19:40:24 2011
New Revision: 1173319
URL: http://svn.apache.org/viewvc?rev=1173319&view=rev
Log:
Use single file per bundle in bundle cache by default. (FELIX-3125)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java?rev=1173319&r1=1173318&r2=1173319&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleArchive.java Tue Sep 20 19:40:24 2011
@@ -144,7 +144,7 @@ public class BundleArchive
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 @@ public class BundleArchive
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)
{
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java?rev=1173319&r1=1173318&r2=1173319&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/cache/BundleCache.java Tue Sep 20 19:40:24 2011
@@ -80,7 +80,8 @@ public class BundleCache
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;