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

[Ron Sigal]

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

  Modified:    src/main/org/jboss/remoting/transport/coyote  Tag:
                        remoting_2_x CoyoteInvoker.java
  Log:
  JBREM-758:  Puts client address in InvocationRequest requestPayload.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.23.2.8  +18 -0     JBossRemoting/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CoyoteInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java,v
  retrieving revision 1.23.2.7
  retrieving revision 1.23.2.8
  diff -u -b -r1.23.2.7 -r1.23.2.8
  --- CoyoteInvoker.java	4 Nov 2007 08:50:16 -0000	1.23.2.7
  +++ CoyoteInvoker.java	20 Nov 2007 09:16:27 -0000	1.23.2.8
  @@ -31,6 +31,7 @@
   import org.jboss.remoting.InvocationRequest;
   import org.jboss.remoting.InvocationResponse;
   import org.jboss.remoting.InvokerLocator;
  +import org.jboss.remoting.Remoting;
   import org.jboss.remoting.Version;
   import org.jboss.remoting.marshal.Marshaller;
   import org.jboss.remoting.marshal.UnMarshaller;
  @@ -50,6 +51,7 @@
   import java.net.InetAddress;
   import java.net.UnknownHostException;
   import java.util.Enumeration;
  +import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
   
  @@ -304,6 +306,22 @@
   
               InvocationRequest invocationRequest = versionedRead(req, request, response, version);
   
  +            if (invocationRequest.getRequestPayload() == null)
  +               invocationRequest.setRequestPayload(new HashMap());
  +            
  +            MessageBytes remoteAddressMB = req.remoteAddr();
  +            if (remoteAddressMB != null)
  +            {
  +               String remoteAddressString = remoteAddressMB.toString();
  +               InetAddress remoteAddress = InetAddress.getByName(remoteAddressString);
  +               invocationRequest.getRequestPayload().put(Remoting.CLIENT_ADDRESS, remoteAddress);  
  +            }
  +            else
  +            {
  +               log.debug("unable to retrieve client address from coyote transport layer");
  +            }
  +            
  +            
               // FIXME: OPTIONS method handling ?
               try
               {