You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/04/08 11:04:18 UTC
svn commit: r931840 - in /jackrabbit/branches/2.1: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/CacheManager.java
Author: jukka
Date: Thu Apr 8 09:04:18 2010
New Revision: 931840
URL: http://svn.apache.org/viewvc?rev=931840&view=rev
Log:
2.1: Merged revision 931838 (JCR-2594)
Modified:
jackrabbit/branches/2.1/ (props changed)
jackrabbit/branches/2.1/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/CacheManager.java
Propchange: jackrabbit/branches/2.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 8 09:04:18 2010
@@ -2,4 +2,4 @@
/jackrabbit/sandbox/JCR-1456:774917-886178
/jackrabbit/sandbox/JCR-2170:812417-816332
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:931479,931483-931484
+/jackrabbit/trunk:931479,931483-931484,931838
Modified: jackrabbit/branches/2.1/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/CacheManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/CacheManager.java?rev=931840&r1=931839&r2=931840&view=diff
==============================================================================
--- jackrabbit/branches/2.1/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/CacheManager.java (original)
+++ jackrabbit/branches/2.1/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/CacheManager.java Thu Apr 8 09:04:18 2010
@@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory;
* distributing the memory in this way, there might be some unused memory (if
* one or more caches did not use some of the allocated memory). This unused
* memory is distributed evenly across the full caches.
- *
*/
public class CacheManager implements CacheAccessListener {
@@ -58,20 +57,29 @@ public class CacheManager implements Cac
/** The size of a big object, to detect if a cache is full or not. */
private static final int BIG_OBJECT_SIZE = 16 * 1024;
- /** The amount of memory to distribute accross the caches. */
- private long maxMemory = DEFAULT_MAX_MEMORY;
+ /** The amount of memory to distribute across the caches. */
+ private long maxMemory = Long.getLong(
+ "org.apache.jackrabbit.maxCacheMemory",
+ DEFAULT_MAX_MEMORY);
/** The minimum size of a cache. */
- private long minMemoryPerCache = DEFAULT_MIN_MEMORY_PER_CACHE;
+ private long minMemoryPerCache = Long.getLong(
+ "org.apache.jackrabbit.minMemoryPerCache",
+ DEFAULT_MIN_MEMORY_PER_CACHE);
/** The maximum memory per cache (unless, there is some unused memory). */
- private long maxMemoryPerCache = DEFAULT_MAX_MEMORY_PER_CACHE;
+ private long maxMemoryPerCache = Long.getLong(
+ "org.apache.jackrabbit.maxMemoryPerCache",
+ DEFAULT_MAX_MEMORY_PER_CACHE);
/** The minimum resize interval time */
- private long minResizeInterval = DEFAULT_MIN_RESIZE_INTERVAL;
+ private long minResizeInterval = Long.getLong(
+ "org.apache.jackrabbit.cacheResizeInterval",
+ DEFAULT_MIN_RESIZE_INTERVAL);
/** The last time the caches where resized. */
- private volatile long nextResize = System.currentTimeMillis() + DEFAULT_MIN_RESIZE_INTERVAL;
+ private volatile long nextResize =
+ System.currentTimeMillis() + DEFAULT_MIN_RESIZE_INTERVAL;
public long getMaxMemory() {