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

[Ron Sigal]

  User: rsigal  
  Date: 07/11/20 22:54:07

  Modified:    src/main/org/jboss/remoting  Tag: remoting_2_x
                        ServerInvoker.java
  Log:
  JBREM-792:  Implements "$GET_CLIENT_LOCAL_ADDRESS$" functionality directly in ServerInvoker.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.52.2.36 +9 -3      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.35
  retrieving revision 1.52.2.36
  diff -u -b -r1.52.2.35 -r1.52.2.36
  --- ServerInvoker.java	1 Nov 2007 02:20:08 -0000	1.52.2.35
  +++ ServerInvoker.java	21 Nov 2007 03:54:07 -0000	1.52.2.36
  @@ -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.35 $
  + * @version $Revision: 1.52.2.36 $
    */
   public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
   {
  @@ -697,8 +697,11 @@
   
            if ("$GET_CLIENT_LOCAL_ADDRESS$".equals(param))
            {
  -             // must be handled upstream by socket-specific code, return a null response here
  -             return new InvocationResponse(invocation.getSessionId(),  null, false, null);
  +            InetAddress address = null;
  +            if (invocation.getRequestPayload() != null)
  +               address = (InetAddress) invocation.getRequestPayload().get(Remoting.CLIENT_ADDRESS);
  +            
  +             return address;
            }
   
            if ("$DISCONNECT$".equals(param))
  @@ -726,6 +729,9 @@
               String subsystem = invocation.getSubsystem();
               String clientId = invocation.getSessionId();
   
  +            log.info("subsystem: " + subsystem);
  +            log.info("handlers: " + handlers);
  +
               //I have optimised this, so that if there is only one handler set (a very common case)
               //then it will just use that without having to do a lookup or HashMap iteration over
               //values