[jboss-cvs] JBoss Messaging SVN: r3956 - in branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss: messaging/core/impl/clusterconnection and 1 other directory.

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

Author: timfox
Date: 2008-03-27 05:23:46 -0400 (Thu, 27 Mar 2008)
New Revision: 3956

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/ServerPeer.java
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-1266


Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/ServerPeer.java	2008-03-27 08:23:22 UTC (rev 3955)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/ServerPeer.java	2008-03-27 09:23:46 UTC (rev 3956)
@@ -278,7 +278,7 @@
       	}
          if (clusterPullConnectionFactoryName != null)
          {         
-	         clusterConnectionManager = new ClusterConnectionManager(useXAForMessagePull, serverPeerID,
+	         clusterConnectionManager = new ClusterConnectionManager(serverPeerID,
 	         		                                                  clusterPullConnectionFactoryName, defaultPreserveOrdering,
 	         		                                                  SecurityMetadataStore.SUCKER_USER, suckerPassword);
 	         clusterNotifier.registerListener(clusterConnectionManager);

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java	2008-03-27 08:23:22 UTC (rev 3955)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java	2008-03-27 09:23:46 UTC (rev 3956)
@@ -66,8 +66,6 @@
    
 	private Map connections;
 	
-	private boolean xa;
-	
 	private boolean started;
 	
 	private int nodeID;
@@ -84,15 +82,13 @@
 	
 	private String suckerPassword;
 	
-	public ClusterConnectionManager(boolean xa, int nodeID,
+	public ClusterConnectionManager(int nodeID,
 			                          String connectionFactoryUniqueName, boolean preserveOrdering,
 			                          String suckerUser,
 			                          String suckerPassword)
 	{
 		connections = new HashMap();
 		
-		this.xa = xa;
-		
 		this.nodeID = nodeID;
 		
 		this.connectionFactoryUniqueName = connectionFactoryUniqueName;
@@ -168,20 +164,6 @@
 		}
 	}
 	
-	public void setIsXA(boolean xa) throws Exception
-	{
-		boolean needToClose = this.xa != xa;
-		if (needToClose)
-		{
-			closeAllSuckers();
-		}
-		this.xa = xa;
-		if (needToClose)
-		{
-			createAllSuckers();
-		}		
-	}
-	
 	public void closeAllSuckers()
 	{
 		Iterator iter = connections.values().iterator();
@@ -395,7 +377,7 @@
 	public String toString()
 	{
 		return "ClusterConnectionManager:" + System.identityHashCode(this) + 
-		        " xa: " + xa + " nodeID: " + nodeID + " connectionFactoryName: " + connectionFactoryUniqueName;
+		        " nodeID: " + nodeID + " connectionFactoryName: " + connectionFactoryUniqueName;
 	}
 	
 	private void ensureAllConnectionsCreated() throws Exception
@@ -489,7 +471,7 @@
 			   }
 			   			   
 				MessageSucker sucker = new MessageSucker(localQueue, info.session, localInfo.session,
-				                                         xa, preserveOrdering, sourceChannelID);
+				                                         preserveOrdering, sourceChannelID);
 	
 				info.addSucker(sucker);
 				

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java	2008-03-27 08:23:22 UTC (rev 3955)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java	2008-03-27 09:23:46 UTC (rev 3956)
@@ -35,13 +35,11 @@
 import org.jboss.jms.client.state.ConsumerState;
 import org.jboss.jms.delegate.ProducerDelegate;
 import org.jboss.jms.delegate.SessionDelegate;
-import org.jboss.jms.destination.JBossDestination;
 import org.jboss.jms.destination.JBossQueue;
 import org.jboss.jms.message.JBossMessage;
 import org.jboss.jms.message.MessageProxy;
 import org.jboss.logging.Logger;
 import org.jboss.messaging.core.contract.Queue;
-import org.jboss.tm.TransactionManagerLocator;
 
 /**
  * 
@@ -87,9 +85,9 @@
 	}
 				
 	MessageSucker(Queue localQueue, Session sourceSession, Session localSession,
-	        boolean xa, boolean preserveOrdering, long sourceChannelID)
+	              boolean preserveOrdering, long sourceChannelID)
    {	
-      if (trace) { log.trace("Creating message sucker, localQueue:" + localQueue + " xa:" + xa + " preserveOrdering:" + preserveOrdering); }
+      if (trace) { log.trace("Creating message sucker, localQueue:" + localQueue + " preserveOrdering:" + preserveOrdering); }
       
       this.jbq = new JBossQueue(localQueue.getName(), true);
       
@@ -102,11 +100,6 @@
       this.preserveOrdering = preserveOrdering;
       
       this.sourceChannelID = sourceChannelID;
-      
-      if (xa)
-      {
-      	tm = TransactionManagerLocator.getInstance().locate();
-      }
    }
 	
 	synchronized void start() throws Exception