Author: violetagg
Date: Wed Jun 11 01:55:59 2014
New Revision: 1601797
URL: http://svn.apache.org/r1601797
Log:
Merged revision 1601796 from tomcat/trunk:
Provide a better error message when asynchronous operations are not supported
by a filter or servlet. Patch provided by Romain Manni-Bucau. Issue was
reported via dev at tomcat.a.o.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1601796
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1601797&r1=1601796&r2=1601797&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Wed
Jun 11 01:55:59 2014
@@ -1655,7 +1655,8 @@ public class Request
public AsyncContext startAsync(ServletRequest request,
ServletResponse response) {
if (!isAsyncSupported()) {
- throw new IllegalStateException("Not supported.");
+ throw new IllegalStateException(
+ "A filter or servlet of the current chain does not support
asynchronous operations.");
}
if (asyncContext == null) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1601797&r1=1601796&r2=1601797&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 11 01:55:59 2014
@@ -89,6 +89,11 @@
<bug>56600</bug>: In WebdavServlet: Do not waste time generating
response for broken PROPFIND request. (kkolinko)
</fix>
+ <fix>
+ Provide a better error message when asynchronous operations are not
+ supported by a filter or servlet. Patch provided by Romain Manni-Bucau.
+ (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
