Author: markt
Date: Mon Mar 24 13:36:45 2014
New Revision: 1580849
URL: http://svn.apache.org/r1580849
Log:
Review after unexpected failed test on OSX
- completed needs to be volatile
- prevent infinite loop
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java?rev=1580849&r1=1580848&r2=1580849&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestCoyoteAdapter.java Mon
Mar 24 13:36:45 2014
@@ -301,8 +301,10 @@ public class TestCoyoteAdapter extends T
client.disconnect();
// Wait for server thread to stop
- while (servlet.getThread().isAlive()) {
+ int count = 0;
+ while (servlet.getThread().isAlive() && count < 10) {
Thread.sleep(250);
+ count ++;
}
Assert.assertTrue(servlet.isCompleted());
}
@@ -314,7 +316,7 @@ public class TestCoyoteAdapter extends T
// This is a hack that won't work generally as servlets are expected to
// handle more than one request.
private Thread t;
- private boolean completed = false;
+ private volatile boolean completed = false;
public Thread getThread() {
return t;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
