[jboss-cvs] JBoss Messaging SVN: r1466 - in branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client: container delegate

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

Author: clebert.suconic at jboss.com
Date: 2006-10-10 19:01:33 -0400 (Tue, 10 Oct 2006)
New Revision: 1466

Modified:
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/ConnectionAspect.java
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-519 - experiments - recreating SessionDelegate on the new node

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/ConnectionAspect.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/ConnectionAspect.java	2006-10-10 22:14:54 UTC (rev 1465)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/ConnectionAspect.java	2006-10-10 23:01:33 UTC (rev 1466)
@@ -21,17 +21,17 @@
   */
 package org.jboss.jms.client.container;
 
-import javax.jms.ConnectionMetaData;
-import javax.jms.ExceptionListener;
+import javax.jms.*;
 import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
 
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.aop.joinpoint.MethodInvocation;
 import org.jboss.jms.client.JBossConnectionMetaData;
+import org.jboss.jms.client.JBossSession;
 import org.jboss.jms.client.remoting.JMSRemotingConnection;
 import org.jboss.jms.client.delegate.ClientConnectionDelegate;
 import org.jboss.jms.client.delegate.DelegateSupport;
+import org.jboss.jms.client.delegate.ClientSessionDelegate;
 import org.jboss.jms.client.state.ConnectionState;
 import org.jboss.jms.client.state.SessionState;
 import org.jboss.jms.message.MessageIdGeneratorFactory;
@@ -210,7 +210,15 @@
         while(sessionsIterator.hasNext())
         {
             SessionState sessionState = (SessionState)sessionsIterator.next();
-            System.out.println("SessionState=" + sessionState);
+
+            ClientSessionDelegate newSessionDelegate=(ClientSessionDelegate)otherConnection.createSessionDelegate(sessionState.isTransacted(),sessionState.getAcknowledgeMode(),sessionState.isXA());
+
+            if (log.isTraceEnabled())
+            {
+                log.trace("Replacing session by a new session created on the new failed over connection - " + newSessionDelegate);
+            }
+
+            sessionState.setDelegate(newSessionDelegate);
         }
 
 

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2006-10-10 22:14:54 UTC (rev 1465)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2006-10-10 23:01:33 UTC (rev 1466)
@@ -115,6 +115,7 @@
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
+    * @see org.jboss.jms.server.endpoint.advised.ConnectionAdvised#createSessionDelegate(boolean, int, boolean) 
     */
    public SessionDelegate createSessionDelegate(boolean transacted,
                                                 int acknowledgmentMode,
@@ -204,6 +205,7 @@
       throw new IllegalStateException("This invocation should not be handled here!");
    }
 
+    /** @see org.jboss.jms.client.container.ConnectionAspect#handleFailover(org.jboss.aop.joinpoint.Invocation) */
     public void failOver(ConnectionDelegate newConnection)
    {
        throw new IllegalStateException("This invocation should not be handled here!");