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

[Ron Sigal]

  User: rsigal  
  Date: 07/11/20 04:16:56

  Modified:    src/main/org/jboss/remoting/transport/rmi  Tag: remoting_2_x
                        RMIServerInvoker.java
  Log:
  JBREM-758:  Puts client address in InvocationRequest requestPayload.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.17.4.4  +24 -1     JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RMIServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RMIServerInvoker.java,v
  retrieving revision 1.17.4.3
  retrieving revision 1.17.4.4
  diff -u -b -r1.17.4.3 -r1.17.4.4
  --- RMIServerInvoker.java	16 Jan 2007 23:21:44 -0000	1.17.4.3
  +++ RMIServerInvoker.java	20 Nov 2007 09:16:56 -0000	1.17.4.4
  @@ -22,6 +22,7 @@
   
   package org.jboss.remoting.transport.rmi;
   
  +import org.jboss.remoting.InvocationRequest;
   import org.jboss.remoting.InvokerLocator;
   import org.jboss.remoting.Remoting;
   import org.jboss.remoting.ServerInvoker;
  @@ -37,6 +38,7 @@
   import java.io.ByteArrayOutputStream;
   import java.io.IOException;
   import java.io.ObjectOutputStream;
  +import java.net.InetAddress;
   import java.rmi.Remote;
   import java.rmi.RemoteException;
   import java.rmi.registry.LocateRegistry;
  @@ -44,6 +46,8 @@
   import java.rmi.server.ExportException;
   import java.rmi.server.RMIClientSocketFactory;
   import java.rmi.server.RMIServerSocketFactory;
  +import java.rmi.server.RemoteServer;
  +import java.rmi.server.ServerNotActiveException;
   import java.rmi.server.UnicastRemoteObject;
   import java.util.HashMap;
   import java.util.Map;
  @@ -53,7 +57,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
  - * @version $Revision: 1.17.4.3 $
  + * @version $Revision: 1.17.4.4 $
    */
   public class RMIServerInvoker extends ServerInvoker implements RMIServerInvokerInf
   {
  @@ -285,6 +289,25 @@
   
         }
   
  +      if (payload instanceof InvocationRequest)
  +      {
  +         InvocationRequest ir = (InvocationRequest) payload;
  +         Map metadata = ir.getRequestPayload();
  +         if (metadata == null)
  +         {
  +            metadata = new HashMap();
  +            ir.setRequestPayload(metadata);
  +         }
  +         try
  +         {
  +            String clientHost = RemoteServer.getClientHost();
  +            metadata.put(Remoting.CLIENT_ADDRESS, InetAddress.getByName(clientHost));
  +         }
  +         catch (ServerNotActiveException e)
  +         {
  +            throw new RemoteException(e.getMessage());
  +         }
  +      }
         Object response = invoke(payload);
   
         /* Jira Issue: JBREM-167