Author: dwoods
Date: Fri Oct 8 21:50:48 2010
New Revision: 1006039
URL: http://svn.apache.org/viewvc?rev=1006039&view=rev
Log:
rollback all SingleEMTestCase changes
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java?rev=1006039&r1=1006038&r2=1006039&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMTestCase.java
Fri Oct 8 21:50:48 2010
@@ -106,20 +106,16 @@ public abstract class SingleEMTestCase
* @return false if the EntityManager was already closed.
*/
protected boolean close() {
- boolean brc = false;
if (em == null)
- return brc;
+ return false;
- try {
- rollback();
+ rollback();
- if (!em.isOpen())
- return brc;
- } finally {
- em.close();
- brc = em.isOpen();
- }
- return !brc;
+ if (!em.isOpen())
+ return false;
+
+ em.close();
+ return !em.isOpen();
}
/**
