Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 84360 invoked from network); 23 Apr 2008 18:30:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Apr 2008 18:30:25 -0000 Received: (qmail 94375 invoked by uid 500); 23 Apr 2008 18:30:20 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 94295 invoked by uid 500); 23 Apr 2008 18:30:18 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 94255 invoked by uid 99); 23 Apr 2008 18:30:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 11:30:18 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Apr 2008 18:29:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 18A6C1A9838; Wed, 23 Apr 2008 11:29:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r650989 - /openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/CacheMap.java Date: Wed, 23 Apr 2008 18:29:53 -0000 To: commits@openjpa.apache.org From: awhite@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080423182954.18A6C1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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){