tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1594924 - in /tomcat/trunk: java/org/apache/catalina/connector/CoyoteAdapter.java webapps/docs/changelog.xml
Date Thu, 15 May 2014 14:17:06 GMT
Author: kkolinko
Date: Thu May 15 14:17:05 2014
New Revision: 1594924

URL: http://svn.apache.org/r1594924
Log:
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56399
Simplify. Reduce logging level.
Update changelog (this change was omitted from 8.0.6).

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1594924&r1=1594923&r2=1594924&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu May 15 14:17:05
2014
@@ -665,18 +665,16 @@ public class CoyoteAdapter implements Ad
         Request request = (Request) req.getNote(ADAPTER_NOTES);
         Response response = (Response) res.getNote(ADAPTER_NOTES);
         try {
-            if (request != null) {
-                if (request.getContext() != null || request.getHost() != null)
-                    throw new RecycleRequiredException();
-            }
-            if (response != null) {
-                if (response.getContentWritten() != 0)
-                    throw new RecycleRequiredException();
+            if (request != null && request.getHost() != null) {
+                throw new RecycleRequiredException();
+            }
+            if (response != null && response.getContentWritten() != 0) {
+                throw new RecycleRequiredException();
             }
         } catch (RecycleRequiredException e) {
             String message = sm.getString("coyoteAdapter.checkRecycled");
             if (connector.getState().isAvailable()) {
-                log.warn(message, e);
+                log.info(message, e);
             } else {
                 // There may be some aborted requests.
                 // When connector shuts down, the request and response will not

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1594924&r1=1594923&r2=1594924&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 15 14:17:05 2014
@@ -54,6 +54,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Coyote">
+    <changelog>
+      <add>
+        <bug>56399</bug>: Assert that both Coyote and Catalina request objects
+        have been properly recycled. (kkolinko)
+      </add>
+    </changelog>
+  </subsection>
   <subsection name="Jasper">
     <changelog>
       <fix>
@@ -246,10 +254,6 @@
         <bug>56348</bug>: Fix slow asynchronous read when read was performed
on
         a non-container thread. (markt)
       </fix>
-      <add>
-        <bug>56399</bug>: Assert that both Coyote and Catalina request objects
-        have been properly recycled. (kkolinko)
-      </add>
       <fix>
         <bug>56416</bug>: Correct documentation for default value of socket
         linger for the AJP and HTTP connectors. (markt)



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


Mime
View raw message