svn commit: r666890 - /openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java

[pcl]

Author: pcl
Date: Wed Jun 11 16:20:27 2008
New Revision: 666890

URL: http://svn.apache.org/viewvc?rev=666890&view=rev
Log:
Backported r650989 to trunk.

Modified:
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java?rev=666890&r1=666889&r2=666890&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java
 Wed Jun 11 16:20:27 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){