tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1209194 - /tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Date Thu, 01 Dec 2011 19:11:57 GMT
Author: markt
Date: Thu Dec  1 19:11:56 2011
New Revision: 1209194

URL: http://svn.apache.org/viewvc?rev=1209194&view=rev
Log:
Re-order the connector.destroy() call to (hopefully) avoid the Gump
failures on this test. Of course, this is based on a guess that
sometimes the 100ms wait isn't quite long enough.

Modified:
    tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java

Modified: tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1209194&r1=1209193&r2=1209194&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java (original)
+++ tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Thu Dec  1 19:11:56
2011
@@ -266,9 +266,6 @@ public class TestCometProcessor extends 
         Thread.sleep(3000);
 
         tomcat.getConnector().stop();
-        // Allow the executor a chance to send the end event
-        Thread.sleep(100);
-        tomcat.getConnector().destroy();
 
         // Wait for the write thread to stop
         int count = 0;
@@ -283,6 +280,9 @@ public class TestCometProcessor extends 
             count ++;
         }
 
+        // Destroy the connector once the executor has sent the end event
+        tomcat.getConnector().destroy();
+
         // Write should trigger an exception once the connector stops since the
         // socket should be closed
         assertNotNull("No exception in writing thread",



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


Mime
View raw message