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

[Ron Sigal]

  User: rsigal  
  Date: 07/10/09 18:20:44

  Modified:    src/main/org/jboss/remoting  Tag: remoting_2_2_0_GA
                        ServerInvoker.java
  Log:
  JBREM-687:  Couple of minor changes to conform to jdk 1.4.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.52.2.28.4.6 +7 -5      JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v
  retrieving revision 1.52.2.28.4.5
  retrieving revision 1.52.2.28.4.6
  diff -u -b -r1.52.2.28.4.5 -r1.52.2.28.4.6
  --- ServerInvoker.java	8 Oct 2007 20:48:40 -0000	1.52.2.28.4.5
  +++ ServerInvoker.java	9 Oct 2007 22:20:43 -0000	1.52.2.28.4.6
  @@ -69,7 +69,7 @@
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.52.2.28.4.5 $
  + * @version $Revision: 1.52.2.28.4.6 $
    */
   public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
   {
  @@ -1097,7 +1097,7 @@
            String bindByHost = System.getProperty(InvokerLocator.BIND_BY_HOST, "True");
            try
            {
  -            byHost = Boolean.parseBoolean(bindByHost);
  +            byHost = Boolean.valueOf(bindByHost).booleanValue();
            }
            catch(Exception e)
            {
  @@ -1124,9 +1124,11 @@
            }
   
            // now create new locator with new host
  -         String oldLocatorUrl = locator.getLocatorURI();
  -         String newLocatorUrl = oldLocatorUrl.replace(InvokerLocator.ANY, newHost);
  -         externalLocator = new InvokerLocator(newLocatorUrl);
  +         externalLocator = new InvokerLocator(locator.protocol,
  +                                              newHost,
  +                                              locator.getPort(),
  +                                              locator.getPath(),
  +                                              locator.getParameters());
            
            // need to update the locator key used in the invoker registry
            InvokerRegistry.updateServerInvokerLocator(locator, externalLocator);