[jboss-cvs] JBoss Messaging SVN: r2067 - in trunk/src/main/org/jboss/jms/client: remoting and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2007-01-26 04:11:43 -0500 (Fri, 26 Jan 2007)
New Revision: 2067

Modified:
   trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
   trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-781 - fix...

We never keep a reference of the new delegates used in failover.
We always copy their IDs and just throw them away.

Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2007-01-26 06:34:37 UTC (rev 2066)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2007-01-26 09:11:43 UTC (rev 2067)
@@ -109,10 +109,10 @@
       // There is one RM per server, so we need to merge the rms if necessary
       ResourceManagerFactory.instance.handleFailover(serverID, newDelegate.getServerID());
 
-      // start the new connection if necessary
+      // start the connection again on the serverEndpoint if necessary
       if (thisState.isStarted())
       {
-         newDelegate.start();
+         this.start();
       }
    }
 

Modified: trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java	2007-01-26 06:34:37 UTC (rev 2066)
+++ trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java	2007-01-26 09:11:43 UTC (rev 2067)
@@ -539,8 +539,6 @@
    public void synchronizeWith(MessageCallbackHandler newHandler)
    {
       consumerID = newHandler.consumerID;
-      consumerDelegate = newHandler.consumerDelegate;
-      sessionDelegate = newHandler.sessionDelegate;
 
       // Clear the buffer. This way the non persistent messages that managed to arive are
       // irremendiably lost, while the peristent ones are failed-over on the server and will be