Author: violetagg
Date: Wed Jun 11 11:13:35 2014
New Revision: 1601852

URL: http://svn.apache.org/r1601852
Log:
Merged revision 1601850 from tomcat/trunk:
Use StringManager for the async not supported message.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1601850

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1601852&r1=1601851&r2=1601852&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties 
Wed Jun 11 11:13:35 2014
@@ -74,6 +74,8 @@ coyoteRequest.sessionEndAccessFail=Excep
 coyoteRequest.sendfileNotCanonical=Unable to determine canonical name of file 
[{0}] specified for use with sendfile
 coyoteRequest.maxPostSizeExceeded=The multi-part request contained parameter 
data (excluding uploaded files) that exceeded the limit for maxPostSize set on 
the associated connector
 
+request.asyncNotSupported=A filter or servlet of the current chain does not 
support asynchronous operations.
+
 requestFacade.nullRequest=The request object has been recycled and is no 
longer associated with this facade
 
 responseFacade.nullResponse=The response object has been recycled and is no 
longer associated with this facade

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=1601852&r1=1601851&r2=1601852&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 11:13:35 2014
@@ -1655,8 +1655,7 @@ public class Request
     public AsyncContext startAsync(ServletRequest request,
             ServletResponse response) {
         if (!isAsyncSupported()) {
-            throw new IllegalStateException(
-                    "A filter or servlet of the current chain does not support 
asynchronous operations.");
+            throw new 
IllegalStateException(sm.getString("request.asyncNotSupported"));
         }
 
         if (asyncContext == null) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to