amyroh      2002/11/03 22:33:02

  Modified:    catalina/src/share/org/apache/catalina/valves
                        ErrorDispatcherValve.java
  Log:
  Fix support for changes made between the public draft and public final draft for 
Filter support in Servlet 2.4.
  
  Errors that were generated by a throwable in the ErrorDispatcherValue had filters 
applied properly but those coming from a setStatus (called from within a servlet) are 
not having filters applied as specfied in the Servlet specification (See SRV.6.2.5 for 
details).
  
  This fixes compliance with the specification.
  
  Submitted by Greg Murray [EMAIL PROTECTED]
  
  Revision  Changes    Path
  1.4       +9 -4      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java
  
  Index: ErrorDispatcherValve.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorDispatcherValve.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ErrorDispatcherValve.java 12 Sep 2002 00:09:28 -0000      1.3
  +++ ErrorDispatcherValve.java 4 Nov 2002 06:33:02 -0000       1.4
  @@ -299,6 +299,10 @@
                                 new Integer(statusCode));
               sreq.setAttribute(Globals.ERROR_MESSAGE_ATTR,
                                 message);
  +            sreq.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
  +                                       errorPage.getLocation());
  +            sreq.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
  +                                                 new 
Integer(ApplicationFilterFactory.ERROR));
               Wrapper wrapper = request.getWrapper();
               if (wrapper != null)
                   sreq.setAttribute(Globals.SERVLET_NAME_ATTR,
  @@ -447,3 +451,4 @@
   
   
   }
  +
  
  
  

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

Reply via email to