tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ContextManager.java
Date Mon, 28 Aug 2000 23:35:21 GMT
nacho       00/08/28 16:35:21

  Modified:    src/share/org/apache/tomcat/core ContextManager.java
  Log:
  Repeat the last change well-done:
  
  In case of bad request there is no context mapped to request so
  only global interceptors are called.
  
  Apologies, commited before compiled another time @:-o
  
  Revision  Changes    Path
  1.126     +5 -6      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.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- ContextManager.java	2000/08/28 23:30:07	1.125
  +++ ContextManager.java	2000/08/28 23:35:20	1.126
  @@ -561,7 +561,11 @@
       */
   
       public RequestInterceptor[] getRequestInterceptors( Request req ) {
  -        Container ct=req.getContext().getContainer();
  +        Context ctx=req.getContext();
  +        // if Bad request (ctx == null) only global interceptors are called
  +        if( ctx == null )
  +           return getRequestInterceptors();
  +        Container ct=ctx.getContainer();
           RequestInterceptor[] ari=ct.getCachedRequestInterceptors();
           if (ari.length == 0){
               RequestInterceptor[] cri=ct.getRequestInterceptors();
  @@ -611,11 +615,6 @@
       }
   
       public ContextInterceptor[] getContextInterceptors(Container ct) {
  -        Context ctx=req.getContext();
  -        // if Bad request (ctx == null) only global interceptors are called
  -        if( ctx == null )
  -           return getRequestInterceptors();
  -        Container ct=ctx.getContainer();
           ContextInterceptor[] aci=ct.getCachedContextInterceptors();
           if (aci.length == 0){
               ContextInterceptor[] cci=ct.getContextInterceptors();
  
  
  

Mime
View raw message