jfarcand    2003/06/25 14:54:38

  Modified:    catalina/src/share/org/apache/catalina/valves
                        ErrorDispatcherValve.java
  Log:
  The pathinfo needs to be set when sreq.getAttribute(Globals.EXCEPTION_ATTR) returns 
null and also non null.
  
  Revision  Changes    Path
  1.8       +7 -6      
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ErrorDispatcherValve.java 19 May 2003 16:26:34 -0000      1.7
  +++ ErrorDispatcherValve.java 25 Jun 2003 21:54:38 -0000      1.8
  @@ -328,8 +328,7 @@
               sreq.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
                                                    new 
Integer(ApplicationFilterFactory.ERROR));
               
  -           ((HttpRequest) request).setPathInfo(errorPage.getLocation());
  -            
  +             
               Wrapper wrapper = request.getWrapper();
               if (wrapper != null)
                   sreq.setAttribute(Globals.SERVLET_NAME_ATTR,
  @@ -412,6 +411,8 @@
           }
           HttpServletResponse hres =
               (HttpServletResponse) response.getResponse();
  +        
  +        ((HttpRequest) request).setPathInfo(errorPage.getLocation());
   
           try {
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to