You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/07/22 20:09:55 UTC
svn commit: r1149678 - in /tomcat/trunk:
java/org/apache/catalina/connector/LocalStrings.properties
java/org/apache/catalina/connector/ResponseFacade.java
webapps/docs/changelog.xml
Author: markt
Date: Fri Jul 22 18:09:54 2011
New Revision: 1149678
URL: http://svn.apache.org/viewvc?rev=1149678&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41709
Provide exception messages for ISEs when response is already committed
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1149678&r1=1149677&r2=1149678&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Fri Jul 22 18:09:54 2011
@@ -44,6 +44,7 @@ coyoteAdapter.accesslogFail=Exception wh
#
coyoteResponse.getOutputStream.ise=getWriter() has already been called for this response
coyoteResponse.getWriter.ise=getOutputStream() has already been called for this response
+coyoteResponse.reset.ise=Cannot call reset() after response has been committed
coyoteResponse.resetBuffer.ise=Cannot reset buffer after response has been committed
coyoteResponse.sendError.ise=Cannot call sendError() after the response has been committed
coyoteResponse.sendRedirect.ise=Cannot call sendRedirect() after the response has been committed
Modified: tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java?rev=1149678&r1=1149677&r2=1149678&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java Fri Jul 22 18:09:54 2011
@@ -250,7 +250,7 @@ public class ResponseFacade
if (isCommitted())
throw new IllegalStateException
- (/*sm.getString("responseBase.reset.ise")*/);
+ (sm.getString("coyoteResponse.setBufferSize.ise"));
response.setBufferSize(size);
@@ -311,7 +311,7 @@ public class ResponseFacade
if (isCommitted())
throw new IllegalStateException
- (/*sm.getString("responseBase.reset.ise")*/);
+ (sm.getString("coyoteResponse.resetBuffer.ise"));
response.resetBuffer();
@@ -335,7 +335,7 @@ public class ResponseFacade
if (isCommitted())
throw new IllegalStateException
- (/*sm.getString("responseBase.reset.ise")*/);
+ (sm.getString("coyoteResponse.reset.ise"));
response.reset();
@@ -441,7 +441,7 @@ public class ResponseFacade
if (isCommitted())
throw new IllegalStateException
- (/*sm.getString("responseBase.reset.ise")*/);
+ (sm.getString("coyoteResponse.sendError.ise"));
response.setAppCommitted(true);
@@ -456,7 +456,7 @@ public class ResponseFacade
if (isCommitted())
throw new IllegalStateException
- (/*sm.getString("responseBase.reset.ise")*/);
+ (sm.getString("coyoteResponse.sendError.ise"));
response.setAppCommitted(true);
@@ -471,7 +471,7 @@ public class ResponseFacade
if (isCommitted())
throw new IllegalStateException
- (/*sm.getString("responseBase.reset.ise")*/);
+ (sm.getString("coyoteResponse.sendRedirect.ise"));
response.setAppCommitted(true);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1149678&r1=1149677&r2=1149678&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jul 22 18:09:54 2011
@@ -63,6 +63,11 @@
ignored when scanning jars for tag libraries. (kkolinko)
</fix>
<fix>
+ <bug>41709</bug>: Provide exception messages where no message is
+ provided currently for IllegalStateExcpetions triggered by calling
+ HttpServletResponse methods when the reponse is committed. (markt)
+ </fix>
+ <fix>
<bug>51509</bug>: Fix potential concurrency issue in CSRF prevention
filter that may lead to some requests failing that should not. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org