Use absolute time spend to unlockAccept and lower down the timeout to 30 secs

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1004168 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 33b9772..4ecb2f6 100644 (file)
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -610,7 +610,7 @@ public class AprEndpoint extends AbstractEndpoint {
             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 AbstractEndpoint {
                     } 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