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

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

Author: clebert.suconic at jboss.com
Date: 2006-11-02 11:49:54 -0500 (Thu, 02 Nov 2006)
New Revision: 1545

Modified:
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-519 -Committing changes  - fixing the build

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-11-02 09:39:02 UTC (rev 1544)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2006-11-02 16:49:54 UTC (rev 1545)
@@ -54,16 +54,19 @@
    private static final long serialVersionUID = 6680015509555859038L;
 
    // Attributes ----------------------------------------------------
+   protected int nodeId;
 
+
    private transient JMSRemotingConnection remotingConnection;
 
    // Static --------------------------------------------------------
 
    // Constructors --------------------------------------------------
 
-   public ClientConnectionDelegate(int objectID)
+   public ClientConnectionDelegate(int objectID, int nodeId)
    {
       super(objectID);
+      this.nodeId=nodeId;
    }
 
    public ClientConnectionDelegate()
@@ -116,7 +119,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) 
+    * @see org.jboss.jms.server.endpoint.advised.ConnectionAdvised#createSessionDelegate(boolean, int, boolean)
     */
    public SessionDelegate createSessionDelegate(boolean transacted,
                                                 int acknowledgmentMode,
@@ -206,10 +209,10 @@
       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)
+    /** @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!");
+       throw new IllegalStateException("This invocation should not be handled here!");
    }
 
    // Public --------------------------------------------------------
@@ -233,6 +236,16 @@
       return remotingConnection;
    }
 
+   public int getNodeID() {
+       return nodeId;
+   }
+
+   public void copyState(DelegateSupport newDelegate)
+   {
+       super.copyState(newDelegate);
+       setRemotingConnection(((ClientConnectionDelegate)newDelegate).getRemotingConnection());
+   }
+
    // Protected -----------------------------------------------------
 
    protected Client getClient()
@@ -240,12 +253,6 @@
       return ((ConnectionState)state).getRemotingConnection().getInvokingClient();
    }
 
-    public void copyState(DelegateSupport newDelegate)
-    {
-        super.copyState(newDelegate);
-        setRemotingConnection(((ClientConnectionDelegate)newDelegate).getRemotingConnection());
-    }
-
     // Package Private -----------------------------------------------
 
    // Private -------------------------------------------------------