tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteRequest.java
Date Sat, 31 May 2003 14:51:54 GMT
remm        2003/05/31 07:51:54

  Modified:    catalina/src/share/org/apache/coyote/tomcat5
                        CoyoteRequest.java
  Log:
  - When the request dispatcher is invoked from outside the filter pipeline, some
    of the needed state flag on the request is not properly set, such as the dispatcher
    type (this should be REQUEST, obviously), and the request path.
  - I don't think this can break anything, as the first thing the piepline will do is
    set them. Having reasonable defaults allows using the RD as a convinience
    feature to implement some container provided features, such as FORM auth.
  
  Revision  Changes    Path
  1.4       +10 -6     jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java
  
  Index: CoyoteRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CoyoteRequest.java	16 May 2003 04:22:01 -0000	1.3
  +++ CoyoteRequest.java	31 May 2003 14:51:54 -0000	1.4
  @@ -911,9 +911,13 @@
       public Object getAttribute(String name) {
   
           if (name.equals(Globals.DISPATCHER_TYPE_ATTR)) {
  -            return dispatcherType;
  +            return (dispatcherType == null) 
  +                ? org.apache.catalina.core.ApplicationFilterFactory.REQUEST_INTEGER
  +                : dispatcherType;
           } else if (name.equals(Globals.DISPATCHER_REQUEST_PATH_ATTR)) {
  -            return requestDispatcherPath.toString();
  +            return (requestDispatcherPath == null) 
  +                ? getRequestPathMB().toString()
  +                : requestDispatcherPath.toString();
           }
   
           Object attr=attributes.get(name);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message