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

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

Author: timfox
Date: 2006-11-02 04:39:02 -0500 (Thu, 02 Nov 2006)
New Revision: 1544

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/ClientSessionDelegate.java
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
Log:
Fixed build


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-11-01 23:34:39 UTC (rev 1543)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/ConnectionAspect.java	2006-11-02 09:39:02 UTC (rev 1544)
@@ -357,7 +357,7 @@
                                 failedConsumerState.getSubscriptionName(),
                                 false,
                                 failedConsumerDelegate.getChannelId(),
-                                connectionDelegate.getNodeID());
+                                failedConnectionState.getServerID());
 
       if (trace) { log.trace("handleFailoverOnConsumer: alternate consumer created"); }
 

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java	2006-11-01 23:34:39 UTC (rev 1543)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java	2006-11-02 09:39:02 UTC (rev 1544)
@@ -187,7 +187,8 @@
    public ConsumerDelegate createConsumerDelegate(JBossDestination destination, String selector,
                                                   boolean noLocal, String subscriptionName,
                                                   boolean connectionConsumer,
-                                                  long oldChannelID,int nodeId) throws JMSException
+                                                  long oldChannelID,
+                                                  int nodeId) throws JMSException
    {
       throw new IllegalStateException("This invocation should not be handled here!");
    }

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2006-11-01 23:34:39 UTC (rev 1543)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2006-11-02 09:39:02 UTC (rev 1544)
@@ -107,9 +107,7 @@
          
          // see if there is a preconfigured client id for the user
          if (username != null)
-         {
-            
-            
+         {                        
             String preconfClientID =
                serverPeer.getJmsUserManagerInstance().getPreConfiguredClientID(username);
             
@@ -132,7 +130,7 @@
          
          log.debug("created and registered " + endpoint);
    
-         return new ClientConnectionDelegate(connectionID,serverPeer.getServerPeerID());
+         return new ClientConnectionDelegate(connectionID);
       }
       catch (Throwable t)
       {

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2006-11-01 23:34:39 UTC (rev 1543)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2006-11-02 09:39:02 UTC (rev 1544)
@@ -146,9 +146,10 @@
    {
       // TODO - Remove this log.info before merging into trunk
       log.info("createConsumerDelegate nodeId=" + nodeId + " oldChannelId=" + oldchannelID);
-      if (nodeId<0)nodeId=this.nodeId;
+      
+      if (nodeId < 0) nodeId = this.nodeId;
 
-      if (nodeId!=this.nodeId)
+      if (nodeId != this.nodeId)
       {
           try
           {
@@ -159,6 +160,7 @@
               e.printStackTrace();
           }
       }
+      
       try
       {
          if (closed)
@@ -203,9 +205,8 @@
             selector = new Selector(selectorString);
          }
 
-
          // fail over channel
-         if (oldchannelID>=0)
+         if (oldchannelID >= 0)
          {
              PostOffice postOfficeToUse = null;
              if (jmsDestination.isTopic())
@@ -222,8 +223,7 @@
                  throw new JMSException("Can't find failed over channel " + oldchannelID);
              }
          }
-         else
-         if (jmsDestination.isTopic())
+         else if (jmsDestination.isTopic())
          {
             if (subscriptionName == null)
             {