[jboss-cvs] JBoss Messaging SVN: r3593 - branches/Branch_Stable/src/main/org/jboss/jms/tx.

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

Author: timfox
Date: 2008-01-18 09:05:49 -0500 (Fri, 18 Jan 2008)
New Revision: 3593

Modified:
   branches/Branch_Stable/src/main/org/jboss/jms/tx/ClientTransaction.java
Log:
Few tweaks to XA fix


Modified: branches/Branch_Stable/src/main/org/jboss/jms/tx/ClientTransaction.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/jms/tx/ClientTransaction.java	2008-01-18 13:45:35 UTC (rev 3592)
+++ branches/Branch_Stable/src/main/org/jboss/jms/tx/ClientTransaction.java	2008-01-18 14:05:49 UTC (rev 3593)
@@ -62,14 +62,7 @@
    private List sessionStatesList;
 
    private boolean clientSide;
-   
-   private boolean hasPersistentAcks;
-   
-   private boolean failedOver;
-   
-   private boolean removeAcks;
-
-
+    
    // Static --------------------------------------------------------
 
    // Constructors --------------------------------------------------
@@ -105,29 +98,9 @@
       }
       SessionTxState sessionTxState = getSessionTxState(sessionId);
 
-      sessionTxState.addAck(info);
-      
-      if (info.getMessageProxy().getMessage().isReliable())
-      {
-         hasPersistentAcks = true;
-      }
-      
-      if (!info.isShouldAck())
-      {
-      	removeAcks = true;
-      }
+      sessionTxState.addAck(info);      
    }
    
-   public boolean hasPersistentAcks()
-   {
-      return hasPersistentAcks;
-   }
-   
-   public boolean isFailedOver()
-   {
-      return failedOver;
-   }
-   
    public void clearMessages()
    {
       if (!clientSide)
@@ -208,8 +181,6 @@
          // swap
          sessionStatesMap = tmpMap;
       }
-      
-      failedOver = true;
    }
 
    /**
@@ -377,9 +348,7 @@
    public void mergeIn(ClientTransaction toMerge)
    {
       state = toMerge.state;
-      hasPersistentAcks = toMerge.hasPersistentAcks;
-      removeAcks = toMerge.removeAcks;
-      failedOver = toMerge.failedOver;
+
       //if there is anything to merge in merge them
       if(toMerge.sessionStatesMap != null)
       {