Author: markt
Date: Thu Jan 22 13:02:57 2015
New Revision: 1653840
URL: http://svn.apache.org/r1653840
Log:
Better fix for BZ 57476
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1653840&r1=1653839&r2=1653840&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Thu
Jan 22 13:02:57 2015
@@ -402,7 +402,6 @@ final class ApplicationDispatcher implem
wrapper.getLogger().debug(" Disabling the response for futher
output");
if (response instanceof ResponseFacade) {
- response.flushBuffer();
((ResponseFacade) response).finish();
} else {
// Servlet SRV.6.2.2. The Request/Response may have been wrapped
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1653840&r1=1653839&r2=1653840&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Thu Jan
22 13:02:57 2015
@@ -160,6 +160,11 @@ final class StandardHostValve extends Va
}
}
+ // Now that the request/response pair is back under container
+ // control lift the suspension so that the error handling can
+ // complete and/or the container can flush any remaining data
+ response.setSuspended(false);
+
Throwable t = (Throwable)
request.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
// Protect against NPEs if the context was destroyed during a
@@ -170,9 +175,6 @@ final class StandardHostValve extends Va
// Look for (and render if found) an application level error page
if (response.isErrorReportRequired()) {
- // Error page processing
- response.setSuspended(false);
-
if (t != null) {
throwable(request, response, t);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
