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:13:31 UTC
svn commit: r1598890 - in /httpcomponents/httpcore/branches/4.3.x:
RELEASE_NOTES.txt
httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
Author: olegk
Date: Sat May 31 18:13:31 2014
New Revision: 1598890
URL: http://svn.apache.org/r1598890
Log:
HTTPASYNC-77: system resources are not correctly deallocated if I/O reactor is shut down while still inactive (not started)
Modified:
httpcomponents/httpcore/branches/4.3.x/RELEASE_NOTES.txt
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/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/branches/4.3.x/RELEASE_NOTES.txt?rev=1598890&r1=1598889&r2=1598890&view=diff
==============================================================================
--- httpcomponents/httpcore/branches/4.3.x/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpcore/branches/4.3.x/RELEASE_NOTES.txt Sat May 31 18:13:31 2014
@@ -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>
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=1598890&r1=1598889&r2=1598890&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:13:31 2014
@@ -545,11 +545,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();