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

[costin]

costin      01/08/28 22:01:24

  Modified:    src/share/org/apache/tomcat/core ContextManager.java
                        Request.java
  Log:
  Extra messages and checks.
  
  Revision  Changes    Path
  1.190     +4 -0      
jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
  
  Index: ContextManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
  retrieving revision 1.189
  retrieving revision 1.190
  diff -u -r1.189 -r1.190
  --- ContextManager.java       2001/08/21 04:55:39     1.189
  +++ ContextManager.java       2001/08/29 05:01:24     1.190
  @@ -1090,6 +1090,10 @@
        else
            ri=req.getContext().getContainer().
                getInterceptors( Container.H_handleError );
  +     if( ri==null ) {
  +         log( "handleError with no error handlers " + req + " " + req.getContext());
  +         return;
  +     }
        for( int i=0; i< ri.length; i++ ) {
            status=ri[i].handleError( req, res, t );
            if( status!=0 ) return;
  
  
  
  1.110     +5 -0      jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- Request.java      2001/08/17 04:02:54     1.109
  +++ Request.java      2001/08/29 05:01:24     1.110
  @@ -72,6 +72,7 @@
   
   import java.security.Principal;
   import java.io.IOException;
  +import java.io.CharConversionException;
   import java.util.Enumeration;
   import java.util.Hashtable;
   
  @@ -430,6 +431,10 @@
                handleQueryParameters();
   
                params.processParameters( formData, 0, available );
  +         } catch(java.io.CharConversionException cex ) {
  +             contextM.log("CharConversionException processing parameters: "
  +                          + this + " "  + cex.toString());
  +             
            } catch(IOException ex ) {
                ex.printStackTrace();
                // XXX should we throw exception or log ?