Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add note about how created EMFs are handled and add check for null EM before using it in endEm(). 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1022142 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-10-13 15:30:24 +00:00
parent a50e380d99
commit e807ca86b8
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java
View File

@ -132,12 +132,17 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
this.props = props;
}
/**
* Closes any EMFs created by getEmf()
*
*/
public void tearDown() throws Exception {
try {
super.tearDown();
} finally {
for (EntityManagerFactory emf : emfs.values()) {
try {
// closeEMF() will also close any open/active EMs
closeEMF(emf);
emf = null;
} catch (Exception e) {
@ -194,6 +199,12 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
return ret;
}
/**
* Creates a EMF and adds it to a Map for cleanup in tearDown()
*
* @param map
* @return
*/
protected OpenJPAEntityManagerFactory getEmf(Map map) {
if (map == null)
map = new HashMap();
@ -238,6 +249,11 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
"SchemaAction='add,deleteTableContents')");
}
/**
* Creates a EMF and adds it to a Map for cleanup in tearDown()
*
* @return
*/
protected OpenJPAEntityManagerFactory getEmf() {
Map m = new HashMap();
return getEmf(m);
@ -285,10 +301,10 @@ public abstract class AbstractTestCase extends AbstractCachedEMFTestCase {
}
protected void endEm(EntityManager em) {
if (em.isOpen())
if (em != null && em.isOpen())
em.close();
if (em == currentEntityManager)
currentEntityManager = null;
currentEntityManager = null;
}
protected Object getStackTrace(Throwable t) {