don't give the selector infinite time to shutdown

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

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index dc71016..fb790b0 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1225,7 +1225,7 @@ public class NioEndpoint {
             close = true;
             events.clear();
             selector.wakeup();
-            try { stopLatch.await(); } catch (InterruptedException ignore ) {}
+            try { stopLatch.await(5,TimeUnit.SECONDS); } catch (InterruptedException ignore ) {}
         }
         
         public void addEvent(Runnable event) {