[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jboss-cvs-commits
Subject:    [jboss-cvs] jbossmq/src/main/org/jboss/mq/pm/jdbc2 PersistenceManager.java
From:       Adrian Brock <ejort () users ! sourceforge ! net>
Date:       2003-05-31 1:10:14
[Download RAW message or body]

  User: ejort   
  Date: 03/05/30 18:10:14

  Modified:    src/main/org/jboss/mq/pm/jdbc2 Tag: Branch_3_2
                        PersistenceManager.java
  Log:
  Terminate the tranasaction through the transaction manager, see bug #731359
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.9   +5 -9      jbossmq/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java
  
  Index: PersistenceManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java,v
  retrieving revision 1.6.2.8
  retrieving revision 1.6.2.9
  diff -u -r1.6.2.8 -r1.6.2.9
  --- PersistenceManager.java	30 May 2003 23:02:46 -0000	1.6.2.8
  +++ PersistenceManager.java	31 May 2003 01:10:13 -0000	1.6.2.9
  @@ -52,7 +52,7 @@
    * @author Jayesh Parayali (jayeshpk1@yahoo.com)
    * @author Hiram Chirino (cojonudo14@hotmail.com)
    *
  - *  @version $Revision: 1.6.2.8 $
  + *  @version $Revision: 1.6.2.9 $
    */
   public class PersistenceManager
      extends ServiceMBeanSupport
  @@ -123,7 +123,6 @@
      {
   
         Transaction threadTx;
  -      Transaction newTransaction;
   
         void startTX() throws JMSException
         {
  @@ -138,9 +137,6 @@
   
               // Always begin a transaction
               tm.begin();
  -
  -            // get it
  -            newTransaction = tm.getTransaction();
            }
            catch (Exception e)
            {
  @@ -161,7 +157,7 @@
            //log.debug("rolling back a TM transaction");
            try
            {
  -            newTransaction.setRollbackOnly();
  +            tm.setRollbackOnly();
            }
            catch (Exception e)
            {
  @@ -174,13 +170,13 @@
            //log.debug("ending TM transaction.");
            try
            {
  -            if (newTransaction.getStatus() == Status.STATUS_MARKED_ROLLBACK)
  +            if (tm.getStatus() == Status.STATUS_MARKED_ROLLBACK)
               {
  -               newTransaction.rollback();
  +               tm.rollback();
               }
               else
               {
  -               newTransaction.commit();
  +               tm.commit();
               }
            }
            catch (Exception e)
  
  
  


-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits
[prev in list] [next in list] [prev in thread] [next in thread]