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 2017/05/09 20:02:49 UTC

[20/34] httpcomponents-core git commit: HTTPASYNC-77: system resources are not correctly deallocated if I/O reactor is shut down while still inactive (not started)

HTTPASYNC-77: system resources are not correctly deallocated if I/O reactor is shut down while still inactive (not started)

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpcore/branches/4.3.x@1598890 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/08d771ae
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/08d771ae
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/08d771ae

Branch: refs/heads/4.3.x
Commit: 08d771ae7a4c7cf7f6eca230725508eada0e414f
Parents: 674135b
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Sat May 31 18:13:31 2014 +0000
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sat May 31 18:13:31 2014 +0000

----------------------------------------------------------------------
 RELEASE_NOTES.txt                                               | 4 ++++
 .../http/impl/nio/reactor/AbstractMultiworkerIOReactor.java     | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/08d771ae/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index b0ce20e..8c846ad 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,6 +1,10 @@
 Changes since Release 4.3.2
 -------------------
 
+* [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-376] AbstractNIOConnPool#requestCancelled() should not process pending requests
   wnen being shut down.
   Contributed by Dmitry Potapov <potapov.d at gmail.com>

http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/08d771ae/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
index b6e4dc7..8177c7f 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
@@ -545,11 +545,6 @@ public abstract class AbstractMultiworkerIOReactor implements IOReactor {
             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();