You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/05/31 20:35:07 UTC
svn commit: r1598894 -
/httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
Author: olegk
Date: Sat May 31 18:35:06 2014
New Revision: 1598894
URL: http://svn.apache.org/r1598894
Log:
HTTPASYNC-77: reverted previous revision; applied a better fix
Modified:
httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
Modified: httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java?rev=1598894&r1=1598893&r2=1598894&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java (original)
+++ httpcomponents/httpcore/branches/4.3.x/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java Sat May 31 18:35:06 2014
@@ -545,6 +545,12 @@ public abstract class AbstractMultiworke
if (this.status.compareTo(IOReactorStatus.ACTIVE) > 0) {
return;
}
+ if (this.status.compareTo(IOReactorStatus.INACTIVE) == 0) {
+ this.status = IOReactorStatus.SHUT_DOWN;
+ cancelRequests();
+ this.selector.close();
+ return;
+ }
this.status = IOReactorStatus.SHUTDOWN_REQUEST;
}
this.selector.wakeup();