[hibernate-commits] Hibernate SVN: r19424 - entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test.

[hibernate-commits at lists.jboss.org]

Author: stliu
Date: 2010-05-08 10:43:04 -0400 (Sat, 08 May 2010)
New Revision: 19424

Modified:
   entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java
Log:
JBPAPP-4235 HHH-4822 Add @FailureExpected annotation to annotations and entitymananger modules to allow the skipping of tests

Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java	2010-05-08 14:38:53 UTC (rev 19423)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/TestCase.java	2010-05-08 14:43:04 UTC (rev 19424)
@@ -118,8 +118,18 @@
 	}
 
 	protected void closeResources() {
-		handleUnclosedResources();
 		try {
+			cleanUnclosed( this.em );
+		} catch ( Exception ignore ) {
+		}
+		for ( Iterator iter = isolatedEms.iterator(); iter.hasNext(); ) {
+			
+			try {
+				cleanUnclosed( ( EntityManager ) iter.next() );
+			} catch ( Exception ignore ) {
+			}
+		}
+		try {
 			if ( factory != null ) {
 				factory.close();
 				factory = null;