cse-ip-svn-commits

[Cse-ip-svn-commits] SF.net SVN: cse-ip:[81] cse-ip/trunk/sandbox/cse-ip/framework/ test-utilities/src/main/java/de/campussource/cse/common/test/ AbstractPersistentUnitTest.java

[<id...@us...>]

Revision: 81
          http://cse-ip.svn.sourceforge.net/cse-ip/?rev=81&view=rev
Author:   idueppe
Date:     2009-03-17 11:48:42 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
fixed NullPointerException while closing EntityManagerFactory if something is wrong with the persistence unit.

Modified Paths:
--------------
    cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java

Modified: cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java	2009-03-10 16:21:51 UTC (rev 80)
+++ cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java	2009-03-17 11:48:42 UTC (rev 81)
@@ -42,7 +42,9 @@
 	
 	@AfterClass
 	public static void closeFactory() {
-		entityManagerFactory.close();
+		if (entityManagerFactory != null) {
+			entityManagerFactory.close();
+		}
 	}
 	
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Cse-ip-svn-commits] SF.net SVN: cse-ip:[84] cse-ip/trunk/sandbox/cse-ip/framework/ test-utilities/src/main/java/de/campussource/cse/common/test/ AbstractPersistentUnitTest.java

[<id...@us...>]

Revision: 84
          http://cse-ip.svn.sourceforge.net/cse-ip/?rev=84&view=rev
Author:   idueppe
Date:     2009-03-17 14:24:08 +0000 (Tue, 17 Mar 2009)

Log Message:
-----------
fixed NullPointerException if an EntityManager couldn't be created.

Modified Paths:
--------------
    cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java

Modified: cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java	2009-03-17 14:23:01 UTC (rev 83)
+++ cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java	2009-03-17 14:24:08 UTC (rev 84)
@@ -33,11 +33,13 @@
 	 */
 	@After
 	public void closeEntity() {
-		EntityTransaction tx = entityManager.getTransaction();
-		if (tx.isActive()) {
-			tx.rollback();
+		if (entityManager != null) {
+			EntityTransaction tx = entityManager.getTransaction();
+			if (tx.isActive()) {
+				tx.rollback();
+			}
+			entityManager.close();
 		}
-		entityManager.close();
 	}
 	
 	@AfterClass


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.