Fix infinite loop reported on users list

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1032901 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/connector/RequestFacade.java b/java/org/apache/catalina/connector/RequestFacade.java
index b49d04a..139f0b7 100644 (file)
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -1028,7 +1028,7 @@ public class RequestFacade implements HttpServletRequest {
     @Override
     public AsyncContext startAsync(ServletRequest request, ServletResponse response)
     throws IllegalStateException {
-        return request.startAsync(request, response);
+        return this.request.startAsync(request, response);
     }
 
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8c008fd..23316bc 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -109,7 +109,12 @@
         for Valves. (markt)
       </fix>
       <fix>
-        Make AccessLogValve attribute <code>enabled</code> changeable to JMX. (pero)
+        Make AccessLogValve attribute <code>enabled</code> changeable via JMX.
+        (pero)
+      </fix>
+      <fix>
+        Correct infinite loop if <code>ServletRequest.startAsync(ServletRequest,
+        ServletResponse)</code> was called. (markt)
       </fix>
     </changelog>
   </subsection>