[seam-commits] Seam SVN: r7740 - branches/Seam_2_0/src/main/org/jboss/seam/util.

[seam-commits at lists.jboss.org]

Author: norman.richards at jboss.com
Date: 2008-03-28 17:35:42 -0400 (Fri, 28 Mar 2008)
New Revision: 7740

Modified:
   branches/Seam_2_0/src/main/org/jboss/seam/util/Work.java
Log:
JBSEAM-2309

Modified: branches/Seam_2_0/src/main/org/jboss/seam/util/Work.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/util/Work.java	2008-03-28 21:29:17 UTC (rev 7739)
+++ branches/Seam_2_0/src/main/org/jboss/seam/util/Work.java	2008-03-28 21:35:42 UTC (rev 7740)
@@ -1,5 +1,6 @@
 package org.jboss.seam.util;
 
+import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
 import org.jboss.seam.log.LogProvider;
@@ -47,7 +48,7 @@
       }
       catch (Exception e)
       {
-         if (begin) 
+         if (begin && userTransaction.getStatus() != Status.STATUS_NO_TRANSACTION) 
          {
             log.debug("rolling back transaction");
             userTransaction.rollback();