From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 9 Nov 2010 09:48:46 +0000 (+0000)
Subject: Fix infinite loop reported on users list
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=170c428518fa9d3e33805607346731387fe0a557;p=tomcat7.0

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 b49d04a59..139f0b744 100644
--- 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 8c008fd18..23316bcef 100644
--- 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>