tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r992882 - in /tomcat/trunk: java/org/apache/tomcat/util/net/JIoEndpoint.java webapps/docs/changelog.xml
Date Sun, 05 Sep 2010 19:49:53 GMT
Author: markt
Date: Sun Sep  5 19:49:53 2010
New Revision: 992882

URL: http://svn.apache.org/viewvc?rev=992882&view=rev
Log:
Make sure async timeout thread is stopped when the connector is stopped.
Correct copy and pasted comment
Also fix @Override warning for the method

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=992882&r1=992881&r2=992882&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Sun Sep  5 19:49:53 2010
@@ -128,9 +128,10 @@ public class JIoEndpoint extends Abstrac
      */
     protected class AsyncTimeout implements Runnable {
         /**
-         * The background thread that listens for incoming TCP/IP connections and
-         * hands them off to an appropriate processor.
+         * The background thread that checks async requests and fires the
+         * timeout if there has been no activity.
          */
+        @Override
         public void run() {
 
             // Loop until we receive a shutdown command
@@ -152,7 +153,7 @@ public class JIoEndpoint extends Abstrac
                 }
                 
                 // Loop if endpoint is paused
-                while (paused) {
+                while (paused && running) {
                     try {
                         Thread.sleep(1000);
                     } catch (InterruptedException e) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=992882&r1=992881&r2=992882&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Sep  5 19:49:53 2010
@@ -139,6 +139,10 @@
         Make sure acceptor threads are stopped when the connector is stopped.
         (markt)
       </fix>
+      <fix>
+        Make sure async timeout thread is stopped when the connector is stopped.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">



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


Mime
View raw message