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

[costin]

costin      01/03/06 23:13:27

  Modified:    src/share/org/apache/tomcat/core ContextManager.java
  Log:
  Small bug - for bad requests, the context is not set.
  
  Revision  Changes    Path
  1.172     +9 -2      
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.171
  retrieving revision 1.172
  diff -u -r1.171 -r1.172
  --- ContextManager.java       2001/03/04 03:31:52     1.171
  +++ ContextManager.java       2001/03/07 07:13:26     1.172
  @@ -298,6 +298,10 @@
       public void setProperty( String name, String value ) {
        properties.put( name, value );
       }
  +
  +    public Hashtable getProperties() {
  +     return properties;
  +    }
       
       // -------------------- Other properties --------------------
   
  @@ -929,8 +933,11 @@
       public final void handleError( Request req, Response res , Throwable t  ) {
        BaseInterceptor ri[];
        int status;
  -     ri=req.getContext().getContainer().
  -         getInterceptors( Container.H_handleError );
  +     if( req.getContext() == null )
  +         ri=getContainer().getInterceptors( Container.H_handleError );
  +     else
  +         ri=req.getContext().getContainer().
  +             getInterceptors( Container.H_handleError );
        for( int i=0; i< ri.length; i++ ) {
            status=ri[i].handleError( req, res, t );
            if( status!=0 ) return;
  
  
  

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