tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Date Tue, 28 Sep 2004 13:32:28 GMT
yoavs       2004/09/28 06:32:28

  Modified:    catalina/src/share/org/apache/catalina/core
                        ApplicationDispatcher.java
               webapps/docs changelog.xml
  Log:
  Bugzilla 30949: make sure ApplicationDispatcher unwraps request/response even if an include
error occurs.
  
  Revision  Changes    Path
  1.40      +6 -9      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
  
  Index: ApplicationDispatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- ApplicationDispatcher.java	27 Jun 2004 23:56:22 -0000	1.39
  +++ ApplicationDispatcher.java	28 Sep 2004 13:32:27 -0000	1.40
  @@ -522,8 +522,6 @@
                                                new Integer(ApplicationFilterFactory.INCLUDE));
               request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
origServletPath);
               invoke(request, outerResponse);
  -            unwrapResponse();
  -
           }
   
           // Handle an HTTP named dispatcher include
  @@ -543,9 +541,6 @@
               invoke(outerRequest, outerResponse);
   
               wrequest.recycle();
  -            unwrapRequest();
  -            unwrapResponse();
  -
           }
   
           // Handle an HTTP path based include
  @@ -581,9 +576,6 @@
               invoke(outerRequest, outerResponse);
   
               wrequest.recycle();
  -            unwrapRequest();
  -            unwrapResponse();
  -
           }
   
       }
  @@ -767,6 +759,11 @@
           // Reset the old context class loader
           if (oldCCL != null)
               Thread.currentThread().setContextClassLoader(oldCCL);
  +        
  +        // Unwrap request/response if needed
  +        // See Bugzilla 30949
  +        unwrapRequest();
  +        unwrapResponse();
   
           // Rethrow an exception if one was thrown by the invoked servlet
           if (ioException != null)
  
  
  
  1.120     +3 -0      jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- changelog.xml	27 Sep 2004 16:04:04 -0000	1.119
  +++ changelog.xml	28 Sep 2004 13:32:28 -0000	1.120
  @@ -69,6 +69,9 @@
        <fix>
          <bug>31356</bug>: Duplicates not counted in session generation. (yoavs)
        </fix>
  +     <fix>
  +       <bug>30949</bug>: Make sure ApplicationDispatcher unwraps request/response
even if include error occurs. (yoavs)
  +     </fix>
       </changelog>
     </subsection>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message