[jboss-remoting-commits] JBoss Remoting SVN: r3662 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi.

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

Author: ron.sigal at jboss.com
Date: 2008-03-18 23:04:07 -0400 (Tue, 18 Mar 2008)
New Revision: 3662

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIClientInvoker.java
Log:
JBREM-933: Fixed handleConnect() for multihome case.

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIClientInvoker.java	2008-03-18 03:22:11 UTC (rev 3661)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/rmi/RMIClientInvoker.java	2008-03-19 03:04:07 UTC (rev 3662)
@@ -210,7 +210,6 @@
    protected void handleConnect()
    throws ConnectionFailedException
    {  
-      storeLocalConfig(configuration);
       int registryPort = getRegistryPort(locator);
       Home home = null;
       Exception savedException = null;
@@ -226,6 +225,7 @@
             String host = home.host;
             int port = home.port;
             locator.setHomeInUse(home);
+            storeLocalConfig(configuration);
             log.debug(this + " looking up registry: " + host + "," + port);
             Registry registry = LocateRegistry.getRegistry(host, registryPort);
             log.debug(this + " trying to connect to: " + home);
@@ -239,6 +239,7 @@
          {
             savedException = e;
             connected = false;
+            RemotingRMIClientSocketFactory.removeLocalConfiguration(locator);
             log.trace("Unable to connect RMI invoker client to " + home, e);
 
          }