You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by un...@apache.org on 2014/12/15 18:12:27 UTC
svn commit: r1643092 - in /jackrabbit/branches/2.8/jackrabbit-data/src:
main/java/org/apache/jackrabbit/core/data/LocalCache.java
test/java/org/apache/jackrabbit/core/data/TestLocalCache.java
Author: unico
Date: Wed Dec 3 10:57:27 2014
New Revision: 1643092
URL: http://svn.apache.org/r1643092
Log:
JCR-3833 LinkedHashMap#entrySet#iterator#remove no longer calls LinkedHashMap#remove, however LocalCache relies on that when it overrides the #remove method.
Modified:
jackrabbit/branches/2.8/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/LocalCache.java
jackrabbit/branches/2.8/jackrabbit-data/src/test/java/org/apache/jackrabbit/core/data/TestLocalCache.java
Modified: jackrabbit/branches/2.8/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/LocalCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/LocalCache.java?rev=1643092&r1=1643091&r2=1643092&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/LocalCache.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/LocalCache.java Wed Dec 3 10:57:27 2014
@@ -526,8 +526,8 @@ public class LocalCache {
Map.Entry<String, Long> entry = itr.next();
if (entry.getKey() != null) {
if (cache.currentSizeInBytes > cache.cachePurgeResize) {
- itr.remove();
-
+ cache.remove(entry.getKey());
+ itr = cache.entrySet().iterator();
} else {
break;
}
Modified: jackrabbit/branches/2.8/jackrabbit-data/src/test/java/org/apache/jackrabbit/core/data/TestLocalCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-data/src/test/java/org/apache/jackrabbit/core/data/TestLocalCache.java?rev=1643092&r1=1643091&r2=1643092&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-data/src/test/java/org/apache/jackrabbit/core/data/TestLocalCache.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-data/src/test/java/org/apache/jackrabbit/core/data/TestLocalCache.java Wed Dec 3 10:57:27 2014
@@ -25,15 +25,12 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
-import junit.framework.TestCase;
-
-import org.apache.jackrabbit.core.data.AsyncUploadCache;
-import org.apache.jackrabbit.core.data.AsyncUploadCacheResult;
-import org.apache.jackrabbit.core.data.LocalCache;
import org.apache.jackrabbit.core.fs.local.FileUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import junit.framework.TestCase;
+
/**
* Testcase to test local cache.
*/