hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1598891 - in /httpcomponents/httpcore/trunk: RELEASE_NOTES.txt httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
Date Sat, 31 May 2014 18:18:10 GMT
Author: olegk
Date: Sat May 31 18:18:09 2014
New Revision: 1598891

URL: http://svn.apache.org/r1598891
Log:
HTTPASYNC-77: system resources are not correctly deallocated if I/O reactor is shut down while
still inactive (not started)

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

Modified: httpcomponents/httpcore/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/RELEASE_NOTES.txt?rev=1598891&r1=1598890&r2=1598891&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpcore/trunk/RELEASE_NOTES.txt Sat May 31 18:18:09 2014
@@ -1,6 +1,10 @@
 Changes for release 4.4-alpha1
 -------------------
 
+* [HTTPASYNC-77] system resources are not correctly deallocated if I/O reactor is shut down
+  while still inactive (not started)
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
 * [HTTPCORE-377] Allow zero SO_LINGER (immediate abortive close).
   Contributed by Dmitry Potapov <potapov.d at gmail.com>
 

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=1598891&r1=1598890&r2=1598891&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
Sat May 31 18:18:09 2014
@@ -548,11 +548,6 @@ 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();
-                return;
-            }
             this.status = IOReactorStatus.SHUTDOWN_REQUEST;
         }
         this.selector.wakeup();



Mime
View raw message