Author: stliu Date: 2011-12-19 04:03:13 -0500 (Mon, 19 Dec 2011) New Revision: 21000 Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java Log: JBPAPP-7072 HHH-6599 - Hibernate mark as rollback even for no transaction requests Modified: entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2011-12-19 08:56:42 UTC (rev 20999) +++ entitymanager/branches/v3_4_0_GA_CP/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2011-12-19 09:03:13 UTC (rev 21000) @@ -418,7 +418,9 @@ ); } try { - transactionManager.setRollbackOnly(); + if ( transactionManager.getStatus() != Status.STATUS_NO_TRANSACTION ) { + transactionManager.setRollbackOnly(); + } } catch (SystemException e) { throw new PersistenceException( "Unable to set the JTA transaction as RollbackOnly", e );