cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/generators ErrorHandler.java

[larryi]

larryi      01/07/05 13:40:47

  Modified:    src/share/org/apache/tomcat/modules/generators
                        ErrorHandler.java
  Log:
  Don't overwrite existing error page definitions with default ones.. This is
  better than leaving ErrorHandler and WebXmlReader interceptors
  sequence dependent in server.xml.    Fixes problem with setting 404 error
  page in web.xml.
  
  Revision  Changes    Path
  1.13      +7 -3      
jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java
  
  Index: ErrorHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ErrorHandler.java 2001/06/02 21:40:38     1.12
  +++ ErrorHandler.java 2001/07/05 20:40:45     1.13
  @@ -121,11 +121,15 @@
        ctx.addServlet( new StatusHandler(this, showDebugInfo));
   
        // Default status handlers
  +        // Assume existing error pages are valid.  Don't overwrite with default.
        ctx.addServlet( new RedirectHandler(this));
  -     ctx.addErrorPage( "302", "tomcat.redirectHandler");
  -     ctx.addErrorPage( "301", "tomcat.redirectHandler");
  +        if (ctx.getErrorPage("302") == null)
  +            ctx.addErrorPage( "302", "tomcat.redirectHandler");
  +        if (ctx.getErrorPage("301") == null)
  +            ctx.addErrorPage( "301", "tomcat.redirectHandler");
        ctx.addServlet( new NotFoundHandler(this, showDebugInfo));
  -     ctx.addErrorPage( "404", "tomcat.notFoundHandler");
  +        if (ctx.getErrorPage("404") == null)
  +            ctx.addErrorPage( "404", "tomcat.notFoundHandler");
   
        if( debug > 0 ) log( "Init " + ctx + " " + showDebugInfo);
       }