You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/10/12 17:38:20 UTC
svn commit: r1021802 - in
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test:
AbstractCachedEMFTestCase.java SingleEMFTestCase.java
Author: dwoods
Date: Tue Oct 12 15:38:20 2010
New Revision: 1021802
URL: http://svn.apache.org/viewvc?rev=1021802&view=rev
Log:
make sure tests cleanup EMs and EMFs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java?rev=1021802&r1=1021801&r2=1021802&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java Tue Oct 12 15:38:20 2010
@@ -76,10 +76,18 @@ public abstract class AbstractCachedEMFT
@Override
protected boolean removeEldestEntry(Map.Entry<K,V> entry) {
OpenJPAEntityManagerFactorySPI oemf = (OpenJPAEntityManagerFactorySPI)entry.getValue();
- // if (oemf != null && oemf.isOpen()) {
- // oemf.close();
- // }
- return this.size() > 2;
+ if (this.size() > 2) {
+ // if the eldest should be removed, then try to close it first
+ if (oemf != null && oemf.isOpen()) {
+ try {
+ oemf.close();
+ } catch (Exception e) {
+ // no-op - eat it
+ }
+ }
+ return true;
+ }
+ return false;
}
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java?rev=1021802&r1=1021801&r2=1021802&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java Tue Oct 12 15:38:20 2010
@@ -85,6 +85,7 @@ public abstract class SingleEMFTestCase
throw e;
} finally {
closeEMF(emf);
+ emf = null;
}
}