Author: epbernard
Date: 2009-12-10 09:11:33 -0500 (Thu, 10 Dec 2009)
New Revision: 18195
Modified:
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
Log:
HHH-4662 do not rollback when the exception occurs
Modified:
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
===================================================================
---
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2009-12-10
14:01:39 UTC (rev 18194)
+++
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2009-12-10
14:11:33 UTC (rev 18195)
@@ -44,6 +44,7 @@
import javax.persistence.TypedQuery;
import javax.persistence.PessimisticLockScope;
import javax.persistence.LockTimeoutException;
+import javax.persistence.QueryTimeoutException;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.metamodel.Metamodel;
@@ -809,6 +810,9 @@
if ( e instanceof LockTimeoutException ) {
return;
}
+ if ( e instanceof QueryTimeoutException ) {
+ return;
+ }
try {
markAsRollback();
Show replies by date