You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by aw...@apache.org on 2008/04/23 20:29:53 UTC
svn commit: r650989 -
/openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java
Author: awhite
Date: Wed Apr 23 11:29:51 2008
New Revision: 650989
URL: http://svn.apache.org/viewvc?rev=650989&view=rev
Log:
Use a pinnedMap that doesn't die on nulls in the CacheMap.
Modified:
openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java
Modified: openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java?rev=650989&r1=650988&r2=650989&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java (original)
+++ openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java Wed Apr 23 11:29:51 2008
@@ -34,8 +34,8 @@
import org.apache.openjpa.lib.util.ReferenceHashMap;
import org.apache.openjpa.lib.util.ReferenceMap;
import org.apache.openjpa.lib.util.SizedMap;
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.openjpa.lib.util.concurrent.ConcurrentReferenceHashMap;
+import org.apache.openjpa.lib.util.concurrent.NullSafeConcurrentHashMap;
import org.apache.openjpa.lib.util.concurrent.SizedConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;
@@ -114,7 +114,7 @@
softMapValueExpired(key);
}
};
- pinnedMap = new ConcurrentHashMap();
+ pinnedMap = new NullSafeConcurrentHashMap();
if (!lru) {
cacheMap = new SizedConcurrentHashMap(size, load, concurrencyLevel){