remm 2002/06/08 22:45:04
Modified: catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- Apply patch for bug 9722, which seems reasonable. According to my testing,
it does not break anything.
Revision Changes Path
1.30 +9 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ApplicationDispatcher.java 11 Dec 2001 08:26:16 -0000 1.29
+++ ApplicationDispatcher.java 9 Jun 2002 05:45:04 -0000 1.30
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
1.29 2001/12/11 08:26:16 remm Exp $
- * $Revision: 1.29 $
- * $Date: 2001/12/11 08:26:16 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
1.30 2002/06/09 05:45:04 remm Exp $
+ * $Revision: 1.30 $
+ * $Date: 2002/06/09 05:45:04 $
*
* ====================================================================
*
@@ -92,6 +92,7 @@
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.connector.ResponseFacade;
import org.apache.catalina.core.StandardWrapper;
import org.apache.catalina.util.InstanceSupport;
@@ -109,7 +110,7 @@
* <code>javax.servlet.ServletResponseWrapper</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.29 $ $Date: 2001/12/11 08:26:16 $
+ * @version $Revision: 1.30 $ $Date: 2002/06/09 05:45:04 $
*/
final class ApplicationDispatcher
@@ -826,7 +827,8 @@
while (current != null) {
// If we run into the container request we are done
- if (current instanceof Request)
+ if ((current instanceof Request)
+ || (current instanceof RequestFacade))
break;
// Remove the current request if it is our wrapper
@@ -862,7 +864,8 @@
while (current != null) {
// If we run into the container response we are done
- if (current instanceof Response)
+ if ((current instanceof Response)
+ || (current instanceof ResponseFacade))
break;
// Remove the current response if it is our wrapper
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
