Author: markt
Date: Fri Jun 6 17:14:19 2014
New Revision: 1600965
URL: http://svn.apache.org/r1600965
Log:
kkolinko review
Use finishResponse() rather than flushBuffer to avoid chunking if not necessary.
Add finishResponse() to ErrorReportValve.report()
Don;t try and reset the response if it has already been marked as in error
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
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=1600965&r1=1600964&r2=1600965&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Fri Jun
6 17:14:19 2014
@@ -290,7 +290,7 @@ final class StandardHostValve extends Va
request.getRequestURI());
if (custom(request, response, errorPage)) {
try {
- response.flushBuffer();
+ response.finishResponse();
} catch (ClientAbortException e) {
// Ignore
} catch (IOException e) {
@@ -366,7 +366,7 @@ final class StandardHostValve extends Va
realError.getClass());
if (custom(request, response, errorPage)) {
try {
- response.flushBuffer();
+ response.finishResponse();
} catch (IOException e) {
container.getLogger().warn("Exception Processing " +
errorPage, e);
}
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1600965&r1=1600964&r2=1600965&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Fri Jun
6 17:14:19 2014
@@ -101,7 +101,7 @@ public class ErrorReportValve extends Va
return;
}
- if (throwable != null) {
+ if (throwable != null && !response.isError()) {
// Make sure that the necessary methods have been called on the
// response. (It is possible a component may just have set the
// Throwable. Tomcat won't do that but other components might.)
@@ -274,6 +274,7 @@ public class ErrorReportValve extends Va
// If writer is null, it's an indication that the response has
// been hard committed already, which should never happen
writer.write(sb.toString());
+ response.finishResponse();
}
} catch (IOException e) {
// Ignore
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
