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

[nacho]

nacho       00/11/06 07:17:19

  Modified:    src/share/org/apache/tomcat/context ErrorHandler.java
  Log:
  * A error loop when reload it's hit many times.
  
  Revision  Changes    Path
  1.3       +13 -4     
jakarta-tomcat/src/share/org/apache/tomcat/context/ErrorHandler.java
  
  Index: ErrorHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/ErrorHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ErrorHandler.java 2000/11/02 21:17:38     1.2
  +++ ErrorHandler.java 2000/11/06 15:17:17     1.3
  @@ -92,8 +92,6 @@
       public void addContext( ContextManager cm, Context ctx)
        throws TomcatException
       {
  -     if( ctx.getHost() == null && ctx.getPath().equals(""))
  -         rootContext = ctx;
       }
   
       /** Add default error handlers
  @@ -101,6 +99,8 @@
       public void contextInit( Context ctx)
        throws TomcatException
       {
  +     if( ctx.getHost() == null && ctx.getPath().equals(""))
  +         rootContext = ctx;
        ctx.addServlet( new ExceptionHandler());
        ctx.addServlet( new StatusHandler());
   
  @@ -206,6 +206,12 @@
                ctx.log("Broken pipe in " + req, t, Logger.DEBUG);  // tuneme
                return;
            }
  +            if( "Connection reset by peer".equals(t.getMessage()))
  +         {
  +             ctx.log("Connection reset by peer in " + req, t, Logger.DEBUG);  // 
tuneme
  +             return;
  +         }
  +
            ctx.log("IOException in " + req, t );
        } else {
            ctx.log("Exception in " + req , t );
  @@ -238,7 +244,10 @@
        }
   
        boolean isDefaultHandler = false;
  -     if( errorLoop( ctx, req ) || errorServlet==null) {
  +     if ( errorLoop( ctx, req ) ){
  +                return;
  +        }
  +        if ( errorServlet==null) {
            errorServlet = ctx.getServletByName("tomcat.exceptionHandler");
            isDefaultHandler = true;
        }
  @@ -506,7 +515,7 @@
            req.getAttribute("javax.servlet.error.message");
        Context ctx=req.getContext();
        
  -     location = makeAbsolute(req, location);
  +     //location = makeAbsolute(req, location);
   
        if( debug>0) ctx.log("Redirect " + location + " " + req );
   
  
  
  

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