[jboss-cvs] JBossAS SVN: r73911 - trunk/server/src/main/org/jboss/ejb/plugins.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2008-06-02 08:25:06 -0400 (Mon, 02 Jun 2008)
New Revision: 73911

Modified:
   trunk/server/src/main/org/jboss/ejb/plugins/AbstractTxInterceptorBMT.java
Log:
[JBAS-5574] - Remove wrong logging when a BMT SFSB doesn't complete its transaction

Modified: trunk/server/src/main/org/jboss/ejb/plugins/AbstractTxInterceptorBMT.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/AbstractTxInterceptorBMT.java	2008-06-02 12:24:49 UTC (rev 73910)
+++ trunk/server/src/main/org/jboss/ejb/plugins/AbstractTxInterceptorBMT.java	2008-06-02 12:25:06 UTC (rev 73911)
@@ -275,46 +275,23 @@
       {
          log.error("Failed to get status", ex);
       }
-
-      try
+      switch (status)
       {
-         
-         switch (status)
-         {
-            case Status.STATUS_COMMITTING :
-            case Status.STATUS_MARKED_ROLLBACK :
-            case Status.STATUS_PREPARING :
-            case Status.STATUS_ROLLING_BACK :
-               try
-               {
-                  tm.rollback();
-               }
-               catch (Exception ex)
-               {
-                  log.error("Failed to rollback", ex);
-               }
-               String msg = "BMT stateful bean '" + container.getBeanMetaData().getEjbName()
-                     + "' did not complete user transaction properly status=" + TxUtils.getStatusAsString(status);
-               log.error(msg);
-         }
-      }
-      finally
-      {
-         Transaction tx = null;
-         try
-         {
-            tx = tm.suspend();
-         }
-         catch (SystemException ex)
-         {
-            log.error("Failed to suspend transaction", ex);
-         }
-         if (tx != null)
-         {
-            String msg = "BMT stateful bean " + container.getBeanMetaData().getEjbName()
-                   + " did not complete user transaction properly tx=" + tx; 
+         case Status.STATUS_COMMITTING :
+         case Status.STATUS_MARKED_ROLLBACK :
+         case Status.STATUS_PREPARING :
+         case Status.STATUS_ROLLING_BACK :
+            try
+            {
+               tm.rollback();
+            }
+            catch (Exception ex)
+            {
+               log.error("Failed to rollback", ex);
+            }
+            String msg = "BMT stateful bean '" + container.getBeanMetaData().getEjbName()
+                  + "' did not complete user transaction properly status=" + TxUtils.getStatusAsString(status);
             log.error(msg);
-         }
       }
    }