Author: dwoods
Date: Fri Oct 8 13:52:32 2010
New Revision: 1005826
URL: http://svn.apache.org/viewvc?rev=1005826&view=rev
Log:
still close EMF even if exceptions occur on closing EMs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java?rev=1005826&r1=1005825&r2=1005826&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
Fri Oct 8 13:52:32 2010
@@ -200,9 +200,12 @@ public abstract class AbstractPersistenc
return false;
}
- closeAllOpenEMs(emf);
- emf.close();
- return !emf.isOpen();
+ try {
+ closeAllOpenEMs(emf);
+ } finally {
+ emf.close();
+ return !emf.isOpen();
+ }
}
/**
