Updated info about felix.cache.locking config property. (FELIX-2700)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1052528 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index fd544fc..3b7aba6 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -218,6 +218,11 @@
* property is set, then it will be calculated as being relative to
* the specified root directory.
* </li>
+ * <li><tt>felix.cache.locking</tt> - Enables or disables bundle cache locking,
+ * which is used to prevent concurrent access to the bundle cache. This is
+ * enabled by default, but on older/smaller JVMs file channel locking is
+ * not available; set this property to <tt>false</tt> to disable it.
+ * </li>
* <li><tt>felix.cache.bufsize</tt> - Sets the buffer size to be used by
* the cache; the default value is 4096. The integer value of this
* string provides control over the size of the internal buffer of the
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 b67c757..777d1d2 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
@@ -53,6 +53,11 @@
* property is set, then it will be calculated as being relative to
* the specified root directory.
* </li>
+ * <li><tt>felix.cache.locking</tt> - Enables or disables bundle cache locking,
+ * which is used to prevent concurrent access to the bundle cache. This is
+ * enabled by default, but on older/smaller JVMs file channel locking is
+ * not available; set this property to <tt>false</tt> to disable it.
+ * </li>
* <li><tt>felix.cache.bufsize</tt> - Sets the buffer size to be used by
* the cache; the default value is 4096. The integer value of this
* string provides control over the size of the internal buffer of the
diff --git a/main/src/main/resources/config.properties b/main/src/main/resources/config.properties
index cd77c48..eadef3f 100644
--- a/main/src/main/resources/config.properties
+++ b/main/src/main/resources/config.properties
@@ -53,6 +53,11 @@
# "none" and "onFirstInit"; the default is "none".
#org.osgi.framework.storage.clean=onFirstInit
+# The following property is used to enable/disable bundle cache locking.
+# On JVMs that do not support file channel locking, you may want to
+# disable this feature. The default is enabled.
+#felix.cache.locking=true
+
# The following property determines which actions are performed when
# processing the auto-deploy directory. It is a comma-delimited list of
# the following values: 'install', 'start', 'update', and 'uninstall'.