Author: mturk Date: Mon Oct 4 09:37:11 2010 New Revision: 1004168 URL: http://svn.apache.org/viewvc?rev=1004168&view=rev Log: Use absolute time spend to unlockAccept and lower down the timeout to 30 secs
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1004168&r1=1004167&r2=1004168&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Oct 4 09:37:11 2010 @@ -610,7 +610,7 @@ public class AprEndpoint extends Abstrac running = false; unlockAccept(); for (int i = 0; i < acceptors.length; i++) { - int c = 0; + long s = System.currentTimeMillis() + 30000; while (acceptors[i].isAlive()) { try { acceptors[i].interrupt(); @@ -618,7 +618,7 @@ public class AprEndpoint extends Abstrac } catch (InterruptedException e) { // Ignore } - if (c++ > 60) { + if (System.currentTimeMillis() >= s) { log.warn(sm.getString("endpoint.warn.unlockAcceptorFailed", acceptors[i].getName())); // If the Acceptor is still running force --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org