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

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

Author: clebert.suconic at jboss.com
Date: 2006-11-02 12:15:00 -0500 (Thu, 02 Nov 2006)
New Revision: 1547

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/server/endpoint/ServerConnectionFactoryEndpoint.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-519 - Reverting changes

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 16:51:54 UTC (rev 1546)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2006-11-02 17:15:00 UTC (rev 1547)
@@ -54,19 +54,15 @@
    private static final long serialVersionUID = 6680015509555859038L;
 
    // Attributes ----------------------------------------------------
-   protected int nodeId;
-
-
    private transient JMSRemotingConnection remotingConnection;
 
    // Static --------------------------------------------------------
 
    // Constructors --------------------------------------------------
 
-   public ClientConnectionDelegate(int objectID, int nodeId)
+   public ClientConnectionDelegate(int objectID)
    {
       super(objectID);
-      this.nodeId=nodeId;
    }
 
    public ClientConnectionDelegate()
@@ -236,10 +232,6 @@
       return remotingConnection;
    }
 
-   public int getNodeID() {
-       return nodeId;
-   }
-
    public void copyState(DelegateSupport newDelegate)
    {
        super.copyState(newDelegate);

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-02 16:51:54 UTC (rev 1546)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2006-11-02 17:15:00 UTC (rev 1547)
@@ -49,26 +49,26 @@
    private static final Logger log = Logger.getLogger(ServerConnectionFactoryEndpoint.class);
 
    // Static --------------------------------------------------------
-   
+
    // Attributes ----------------------------------------------------
 
    private ServerPeer serverPeer;
-   
+
    private String clientID;
-   
+
    private int id;
-   
+
    private JNDIBindings jndiBindings;
-   
+
    private int prefetchSize;
-   
+
    protected int defaultTempQueueFullSize;
-   
+
    protected int defaultTempQueuePageSize;
-   
+
    protected int defaultTempQueueDownCacheSize;
 
- 
+
    // Constructors --------------------------------------------------
 
    /**
@@ -94,43 +94,43 @@
    }
 
    // ConnectionFactoryDelegate implementation ----------------------
-   
+
    public ConnectionDelegate createConnectionDelegate(String username, String password)
       throws JMSException
    {
       try
       {
          log.debug("creating a new connection for user " + username);
-         
+
          // authenticate the user
          serverPeer.getSecurityManager().authenticate(username, password);
-         
+
          // see if there is a preconfigured client id for the user
          if (username != null)
-         {                        
+         {
             String preconfClientID =
                serverPeer.getJmsUserManagerInstance().getPreConfiguredClientID(username);
-            
+
             if (preconfClientID != null)
             {
                clientID = preconfClientID;
             }
          }
-   
+
          // create the corresponding "server-side" connection endpoint and register it with the
          // server peer's ClientManager
          ServerConnectionEndpoint endpoint =
             new ServerConnectionEndpoint(serverPeer, clientID, username, password, prefetchSize,
                      defaultTempQueueFullSize, defaultTempQueuePageSize, defaultTempQueueDownCacheSize);
-   
+
          int connectionID = endpoint.getConnectionID();
-   
+
          ConnectionAdvised connAdvised = new ConnectionAdvised(endpoint);
          JMSDispatcher.instance.registerTarget(new Integer(connectionID), connAdvised);
-         
+
          log.debug("created and registered " + endpoint);
-   
-         return new ClientConnectionDelegate(connectionID,serverPeer.getServerPeerID());
+
+         return new ClientConnectionDelegate(connectionID);
       }
       catch (Throwable t)
       {