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/catalina/core ApplicationFilterFactory.java StandardWrapperValve.java
Date Thu, 30 Jan 2003 18:22:48 GMT
remm        2003/01/30 10:22:48

  Modified:    catalina/src/share/org/apache/catalina Globals.java
               catalina/src/share/org/apache/catalina/core
                        ApplicationFilterFactory.java
                        StandardWrapperValve.java
  Log:
  - Add optimized processing for request dispatcher state (which are done using
    Catalina proprietary request attributes).
  - No notifications will be sent for these attributes changes to listeners (if that's
    contrary to the spec, let me know; it looks ok as these are proprietary
    internal attributes).
  
  Revision  Changes    Path
  1.4       +15 -4     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java
  
  Index: Globals.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Globals.java	17 Dec 2002 20:05:07 -0000	1.3
  +++ Globals.java	30 Jan 2003 18:22:47 -0000	1.4
  @@ -104,6 +104,17 @@
       public static final String CLASS_LOADER_ATTR =
           "org.apache.catalina.classloader";
   
  +    /**
  +     * Request dispatcher state.
  +     */
  +    public static final String DISPATCHER_TYPE_ATTR = 
  +        "org.apache.catalina.core.DISPATCHER_TYPE";
  +
  +    /**
  +     * Request dispatcher path.
  +     */
  +    public static final String DISPATCHER_REQUEST_PATH_ATTR = 
  +        "org.apache.catalina.core.DISPATCHER_REQUEST_PATH";
   
       /**
        * The JNDI directory context which is associated with the context. This
  
  
  
  1.7       +8 -5      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java
  
  Index: ApplicationFilterFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApplicationFilterFactory.java	29 Jan 2003 21:23:29 -0000	1.6
  +++ ApplicationFilterFactory.java	30 Jan 2003 18:22:47 -0000	1.7
  @@ -78,6 +78,7 @@
   import org.apache.catalina.Request;
   import org.apache.catalina.Response;
   import org.apache.catalina.Container;
  +import org.apache.catalina.Globals;
   import org.apache.catalina.Wrapper;
   
   /**
  @@ -99,8 +100,10 @@
       public static final int REQUEST = 8;
       public static final Integer REQUEST_INTEGER = new Integer(REQUEST);
   
  -    public static final String DISPATCHER_TYPE_ATTR="org.apache.catalina.core.DISPATCHER_TYPE";
  -    public static final String DISPATCHER_REQUEST_PATH_ATTR="org.apache.catalina.core.DISPATCHER_REQUEST_PATH";
  +    public static final String DISPATCHER_TYPE_ATTR = 
  +        Globals.DISPATCHER_TYPE_ATTR;
  +    public static final String DISPATCHER_REQUEST_PATH_ATTR = 
  +        Globals.DISPATCHER_REQUEST_PATH_ATTR;
   
       private static final SecurityManager securityManager = 
           System.getSecurityManager();
  
  
  
  1.11      +5 -5      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
  
  Index: StandardWrapperValve.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- StandardWrapperValve.java	29 Jan 2003 21:23:29 -0000	1.10
  +++ StandardWrapperValve.java	30 Jan 2003 18:22:47 -0000	1.11
  @@ -274,7 +274,7 @@
                ApplicationFilterFactory.REQUEST_INTEGER);
           sreq.setAttribute
               (ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, 
  -             requestPathMB.toString());
  +             requestPathMB);
           // Create the filter chain for this request
           ApplicationFilterFactory factory = 
               ApplicationFilterFactory.getInstance();
  
  
  

---------------------------------------------------------------------
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