hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r831310 - /httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
Date Fri, 30 Oct 2009 14:31:55 GMT
Author: olegk
Date: Fri Oct 30 14:31:54 2009
New Revision: 831310

URL: http://svn.apache.org/viewvc?rev=831310&view=rev
Log:
Cancel pending requests when shutting down an I/O reactor in the INACTIVE state

Modified:
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java?rev=831310&r1=831309&r2=831310&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
Fri Oct 30 14:31:54 2009
@@ -501,6 +501,11 @@
             if (this.status.compareTo(IOReactorStatus.ACTIVE) > 0) {
                 return;
             }
+            if (this.status.compareTo(IOReactorStatus.INACTIVE) == 0) {
+                this.status = IOReactorStatus.SHUT_DOWN;
+                cancelRequests();
+                return;
+            }
             this.status = IOReactorStatus.SHUTDOWN_REQUEST;
             this.selector.wakeup();
             try {



Mime
View raw message