svn commit: r918155 - /james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPATransactionalMapper.java

[no...@apache.org]

Author: norman
Date: Tue Mar  2 19:10:39 2010
New Revision: 918155

URL: http://svn.apache.org/viewvc?rev=918155&view=rev
Log:
Check if transaction is active before try to rollback (IMAP-113). Thx to Tim-Christian Mundt for reporting this bug

Modified:
    james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPATransactionalMapper.java

Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPATransactionalMapper.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPATransactionalMapper.java?rev=918155&r1=918154&r2=918155&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPATransactionalMapper.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPATransactionalMapper.java Tue Mar  2 19:10:39 2010
@@ -19,6 +19,7 @@
 package org.apache.james.imap.jpa.mail;
 
 import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
 import javax.persistence.PersistenceException;
 
 import org.apache.james.imap.api.display.HumanReadableText;
@@ -66,6 +67,10 @@
      * @see org.apache.james.imap.store.mail.AbstractTransactionalMapper#rollback()
      */
     protected void rollback() throws StorageException {
-        entityManager.getTransaction().rollback();
+        EntityTransaction transaction = entityManager.getTransaction();
+        // check if we have a transaction to rollback
+        if (transaction.isActive()) {
+            entityManager.getTransaction().rollback();
+        }
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org