Author: fhanik
Date: Tue Mar 20 18:34:07 2007
New Revision: 520693
URL: http://svn.apache.org/viewvc?view=rev&rev=520693
Log:
don't give the selector infinite time to shutdown
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?view=diff&rev=520693&r1=520692&r2=520693
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue
Mar 20 18:34:07 2007
@@ -1225,7 +1225,7 @@
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
