[jboss-cvs] JBossAS SVN: r68586 - in branches/JBoss_4_0_3_SP1_CP/messaging/src/main/org/jboss/mq: sm/jdbc and 1 other directory.

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

Author: jhowell at redhat.com
Date: 2008-01-02 11:31:46 -0500 (Wed, 02 Jan 2008)
New Revision: 68586

Modified:
   branches/JBoss_4_0_3_SP1_CP/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java
   branches/JBoss_4_0_3_SP1_CP/messaging/src/main/org/jboss/mq/sm/jdbc/JDBCStateManager.java
Log:
[ASPATCH-329] Transaction timeout is not raising a JMSException in the JBossMQ Persistence manager or StateManager

Modified: branches/JBoss_4_0_3_SP1_CP/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java	2008-01-02 03:37:28 UTC (rev 68585)
+++ branches/JBoss_4_0_3_SP1_CP/messaging/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java	2008-01-02 16:31:46 UTC (rev 68586)
@@ -138,6 +138,7 @@
     */
    protected class TransactionManagerStrategy
    {
+      boolean rollback = false;
 
       Transaction threadTx;
 
@@ -171,15 +172,7 @@
 
       void setRollbackOnly() throws JMSException
       {
-         //log.debug("rolling back a TM transaction");
-         try
-         {
-            tm.setRollbackOnly();
-         }
-         catch (Exception e)
-         {
-            throw new SpyJMSException("Could not start a mark the transaction for rollback .", e);
-         }
+         rollback = true;
       }
 
       void endTX() throws JMSException
@@ -187,7 +180,7 @@
          //log.debug("ending TM transaction.");
          try
          {
-            if (tm.getStatus() == Status.STATUS_MARKED_ROLLBACK)
+            if (rollback)
             {
                tm.rollback();
             }

Modified: branches/JBoss_4_0_3_SP1_CP/messaging/src/main/org/jboss/mq/sm/jdbc/JDBCStateManager.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/messaging/src/main/org/jboss/mq/sm/jdbc/JDBCStateManager.java	2008-01-02 03:37:28 UTC (rev 68585)
+++ branches/JBoss_4_0_3_SP1_CP/messaging/src/main/org/jboss/mq/sm/jdbc/JDBCStateManager.java	2008-01-02 16:31:46 UTC (rev 68586)
@@ -505,6 +505,8 @@
 
       Transaction threadTx;
 
+      boolean rollback = false;
+      
       Connection connection;
 
       HashSet statements = new HashSet();
@@ -558,14 +560,7 @@
 
       void setRollbackOnly() throws JMSException
       {
-         try
-         {
-            tm.setRollbackOnly();
-         }
-         catch (Exception e)
-         {
-            throw new SpyJMSException("Could not mark the transaction for rollback.", e);
-         }
+         rollback = true;
       }
 
       void addResultSet(ResultSet rs)
@@ -621,7 +616,7 @@
 
          try
          {
-            if (tm.getStatus() == Status.STATUS_MARKED_ROLLBACK)
+            if (rollback)
             {
                tm.rollback();
             }