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

[Ron Sigal]

  User: rsigal  
  Date: 07/02/23 03:46:05

  Modified:    src/main/org/jboss/remoting/transport/coyote 
                        CoyoteInvoker.java
  Log:
  JBREM-707:  versionedRead() creates a new InvocationRequest for OPTIONS invocations with empty body.
  
  Revision  Changes    Path
  1.24      +6 -1      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
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- CoyoteInvoker.java	30 Oct 2006 17:48:44 -0000	1.23
  +++ CoyoteInvoker.java	23 Feb 2007 08:46:05 -0000	1.24
  @@ -38,6 +38,7 @@
   import org.jboss.remoting.transport.http.HTTPMetadataConstants;
   import org.jboss.remoting.transport.web.WebServerInvoker;
   import org.jboss.remoting.transport.web.WebUtil;
  +import org.jboss.logging.Logger;
   
   import javax.net.ServerSocketFactory;
   import java.io.IOException;
  @@ -64,6 +65,8 @@
    */
   public class CoyoteInvoker extends WebServerInvoker implements Adapter
   {
  +   private static final Logger log = Logger.getLogger(CoyoteInvoker.class);
  +
      /** Indicates if input was raw or an InvocationRequest */
      protected static ThreadLocal receivedInvocationRequest = new ThreadLocal();
      protected static final Boolean FALSE = new Boolean(false);
  @@ -440,7 +443,9 @@
   
               receivedInvocationRequest.set(FALSE);
               InvocationRequest invocationRequest = null;
  -            if (req.method().equals("GET") || req.method().equals("HEAD"))
  +            MessageBytes method = req.method(); 
  +            if (method.equals("GET") || method.equals("HEAD")
  +                  || (method.equals("OPTIONS") && req.getContentLength() <= 0))
               {
                  invocationRequest = createNewInvocationRequest(request, response, null);
               } else