remm 2004/07/07 09:32:59
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapperValve.java StandardHostValve.java
Log:
- Among some of my changes, facading works differently now (I can't really remember
why this problem
appeared, though).
Revision Changes Path
1.31 +6 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- StandardWrapperValve.java 27 Jun 2004 23:56:22 -0000 1.30
+++ StandardWrapperValve.java 7 Jul 2004 16:32:59 -0000 1.31
@@ -187,8 +187,7 @@
ApplicationFilterFactory factory =
ApplicationFilterFactory.getInstance();
ApplicationFilterChain filterChain =
- factory.createFilterChain((ServletRequest) request,
- wrapper, servlet);
+ factory.createFilterChain(request, wrapper, servlet);
// Call the filter chain for this request
// NOTE: This also calls the servlet's service() method
@@ -204,7 +203,8 @@
if (context.getSwallowOutput()) {
try {
SystemLogHandler.startCapture();
- filterChain.doFilter(request, response);
+ filterChain.doFilter(request.getRequest(),
+ response.getResponse());
} finally {
String log = SystemLogHandler.stopCapture();
if (log != null && log.length() > 0) {
@@ -212,7 +212,8 @@
}
}
} else {
- filterChain.doFilter(request, response);
+ filterChain.doFilter
+ (request.getRequest(), response.getResponse());
}
}
1.23 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
Index: StandardHostValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- StandardHostValve.java 23 Jun 2004 16:59:40 -0000 1.22
+++ StandardHostValve.java 7 Jul 2004 16:32:59 -0000 1.23
@@ -350,7 +350,7 @@
request.getContext().getServletContext();
RequestDispatcher rd =
servletContext.getRequestDispatcher(errorPage.getLocation());
- rd.forward(request, response);
+ rd.forward(request.getRequest(), response.getResponse());
// If we forward, the response is suspended again
response.setSuspended(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
