You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/11/08 06:38:04 UTC
svn commit: r593017 -
/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
Author: trustin
Date: Wed Nov 7 21:38:02 2007
New Revision: 593017
URL: http://svn.apache.org/viewvc?rev=593017&view=rev
Log:
Related issue: DIRMINA-316 (Manual shutdown of I/O worker threads and Selectors)
* Made sure the connector thread doesn't stop unless dispose() is called.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java?rev=593017&r1=593016&r2=593017&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java Wed Nov 7 21:38:02 2007
@@ -317,10 +317,11 @@
cancelKeys();
- if (selector.keys().isEmpty()) {
+ if (selector.keys().isEmpty() && isDisposed()) {
synchronized (lock) {
- if (selector.keys().isEmpty()
- && connectQueue.isEmpty()) {
+ if (selector.keys().isEmpty() &&
+ connectQueue.isEmpty() &&
+ isDisposed()) {
worker = null;
break;
}