[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/rmi ...

[Ron Sigal]

  User: rsigal  
  Date: 07/05/09 04:39:08

  Modified:    src/main/org/jboss/remoting/transport/rmi  Tag:
                        remoting_2_2_0_GA
                        RemotingRMIClientSocketFactory.java
  Log:
  JBREM-714: Ignore configMaps if InvokerLocator is null (if server is older version).
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.9.4.4.4.1 +13 -8     JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RemotingRMIClientSocketFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java,v
  retrieving revision 1.9.4.4
  retrieving revision 1.9.4.4.4.1
  diff -u -b -r1.9.4.4 -r1.9.4.4.4.1
  --- RemotingRMIClientSocketFactory.java	6 Feb 2007 04:23:23 -0000	1.9.4.4
  +++ RemotingRMIClientSocketFactory.java	9 May 2007 08:39:08 -0000	1.9.4.4.4.1
  @@ -66,7 +66,7 @@
    * with localhost will allow the retrieval of objects bound to localhost.
    *
    * @author <a href="mailto:r.sigal at computer.org">Ron Sigal</a>
  - * @version $Revision: 1.9.4.4 $
  + * @version $Revision: 1.9.4.4.4.1 $
    *          <p/>
    *          Copyright (c) 2005
    *          </p>
  @@ -166,6 +166,9 @@
         // Note: the previous observation might be incorrect.  The phenomenon of missing
         // entries in configMaps might simply have been an error in the definition of
         // ComparableHolder.equals.  See JBREM-697.
  +
  +      if (invokerLocator != null)
  +      {
         ComparableHolder holder = new ComparableHolder(invokerLocator);
         if (!configMaps.containsKey(holder))
         {
  @@ -174,9 +177,11 @@
            return new Socket(host, port);
         }
         socketFactory = retrieveSocketFactory(holder);
  -      String effectiveHost = hostName != null ? hostName : host;
  +      }
   
  +      String effectiveHost = hostName != null ? hostName : host;
         Socket socket = null;
  +      
         if(socketFactory != null)
         {
            socket = socketFactory.createSocket(effectiveHost, port);