You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by al...@apache.org on 2009/11/05 23:27:03 UTC
svn commit: r833218 -
/openjpa/branches/1.3.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
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);