Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 72345 invoked from network); 5 Nov 2009 22:27:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Nov 2009 22:27:27 -0000 Received: (qmail 6574 invoked by uid 500); 5 Nov 2009 22:27:27 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 6552 invoked by uid 500); 5 Nov 2009 22:27:27 -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 6543 invoked by uid 99); 5 Nov 2009 22:27:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2009 22:27:27 +0000 X-ASF-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2009 22:27:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 82B852388980; Thu, 5 Nov 2009 22:27:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r833218 - /openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Date: Thu, 05 Nov 2009 22:27:03 -0000 To: commits@openjpa.apache.org From: allee8285@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091105222703.82B852388980@eris.apache.org> Author: allee8285 Date: Thu Nov 5 22:27:03 2009 New Revision: 833218 URL: http://svn.apache.org/viewvc?rev=833218&view=rev Log: OPENJPA-1375 - Clean _plans IdentityHashMap when clear or close is called. Modified: openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Modified: openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=833218&r1=833217&r2=833218&view=diff ============================================================================== --- openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original) +++ openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Thu Nov 5 22:27:03 2009 @@ -32,7 +32,6 @@ import java.util.Collection; import java.util.EnumSet; import java.util.Map; -import java.util.HashMap; import java.util.IdentityHashMap; import javax.persistence.EntityManager; import javax.persistence.FlushModeType; @@ -982,6 +981,7 @@ public void clear() { assertNotCloseInvoked(); _broker.detachAll(this, false); + _plans.clear(); } public Object getDelegate() { @@ -1113,6 +1113,7 @@ public void close() { assertNotCloseInvoked(); _broker.close(); + _plans.clear(); } public boolean isOpen() { @@ -1325,13 +1326,13 @@ } } - protected Class resolveClass(ObjectStreamClass classDesc) + protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException { String cname = classDesc.getName(); if (cname.startsWith("[")) { // An array - Class component; // component class + Class component; // component class int dcount; // dimension for (dcount=1; cname.charAt(dcount)=='['; dcount++) ; if (cname.charAt(dcount) == 'L') { @@ -1357,7 +1358,7 @@ * If this is a generated subclass, look up the corresponding Class * object via metadata. */ - private Class lookupClass(String className) + private Class lookupClass(String className) throws ClassNotFoundException { try { return Class.forName(className);