cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Handler.java

[costin]

costin      01/02/05 22:37:38

  Modified:    src/share/org/apache/tomcat/core Handler.java
  Log:
  Corresponding changes in Handler - for better exception treatment.
  
  Revision  Changes    Path
  1.36      +9 -1      jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Handler.java      2001/01/01 02:36:00     1.35
  +++ Handler.java      2001/02/06 06:37:37     1.36
  @@ -213,6 +213,7 @@
        *  runtime exceptions )
        */
       public void service(Request req, Response res)
  +     throws Exception
       {
        BaseInterceptor reqI[]=
            req.getContainer().getInterceptors(Container.H_preService);
  @@ -228,6 +229,7 @@
            serviceException=ex;
            // if new exception, update info
            if ( ex != res.getErrorException() ) {
  +             //log("setErrorException " + ex ); 
                res.setErrorException(ex);
                res.setErrorURI(null);
            }
  @@ -240,8 +242,12 @@
        }
   
        // if error, handle
  -     if( serviceException != null )
  +     if( serviceException != null ) {
  +         //log("handle " + serviceException );
  +         //serviceException.printStackTrace();
            handleServiceError( req, res, serviceException );
  +         //log("XXX After handleServiceError");
  +     }
       }
   
       /** A handler may either directly generate the response or it can
  @@ -273,7 +279,9 @@
       // -------------------- methods you can override --------------------
       
       protected void handleServiceError( Request req, Response res, Throwable t )
  +     throws Exception
       {
  +     //log("handleServiceError " + t);
        contextM.handleError( req, res, t );
       }
       
  
  
  

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