[Hibernate-commits] Hibernate Code SVN: r9579 - trunk/HibernateExt/ejb/src/java/org/hibernate/ejb

[<hib...@li...>]

Author: epbernard
Date: 2006-03-08 18:31:02 -0500 (Wed, 08 Mar 2006)
New Revision: 9579

Modified:
   trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
Log:
EJB-139

Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java	2006-03-08 22:41:38 UTC (rev 9578)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java	2006-03-08 23:31:02 UTC (rev 9579)
@@ -206,10 +206,10 @@
 	public abstract Session getSession();
 
 	public EntityTransaction getTransaction() {
-		//if (transactionType == PersistenceUnitTransactionType.JTA
-		//		|| ! isOpen() ) {
-		//	throw new IllegalStateException( "JTA EntityManager or closed EntityManager" );
-		//}
+		if (transactionType == PersistenceUnitTransactionType.JTA
+				|| ! isOpen() ) {
+			throw new IllegalStateException( "JTA EntityManager or closed EntityManager" );
+		}
 		return tx;
 	}
 
@@ -240,7 +240,7 @@
 			this.flushMode = FlushModeType.COMMIT;
 		}
 		else if ( mode == FlushMode.NEVER ) {
-			if ( PersistenceContextType.EXTENDED == persistenceContextType && !getTransaction().isActive() ) {
+			if ( PersistenceContextType.EXTENDED == persistenceContextType && !isTransactionInProgress() ) {
 				//we are in flushMode none for EXTENDED
 				return flushMode;
 			}
@@ -325,7 +325,7 @@
 	}
 
 	/**
-	 * returns the session
+	 * returns the underlying session
 	 */
 	public Object getDelegate() {
 		return getSession();