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:44 UTC
[15/34] httpcomponents-core git commit: HTTPCORE-376:
AbstractNIOConnPool#requestCancelled() should not process pending requests
wnen being shut down Contributed by Dmitry Potapov
HTTPCORE-376: AbstractNIOConnPool#requestCancelled() should not process pending requests wnen being shut down
Contributed by Dmitry Potapov <potapov.d at gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpcore/branches/4.3.x@1581300 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/09f0e8d1
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/09f0e8d1
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/09f0e8d1
Branch: refs/heads/4.3.x
Commit: 09f0e8d1823619ff51d969e1ba931065c5690672
Parents: 95644d8
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Tue Mar 25 12:19:01 2014 +0000
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Tue Mar 25 12:19:01 2014 +0000
----------------------------------------------------------------------
RELEASE_NOTES.txt | 4 ++++
.../main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java | 5 ++++-
.../src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java | 2 ++
3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/09f0e8d1/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index d652274..b0ce20e 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,6 +1,10 @@
Changes since Release 4.3.2
-------------------
+* [HTTPCORE-376] AbstractNIOConnPool#requestCancelled() should not process pending requests
+ wnen being shut down.
+ Contributed by Dmitry Potapov <potapov.d at gmail.com>
+
* [HTTPASYNC-69]: async request handler is closed by HttpAsyncRequestExecutor#closed
if the underlying connection is found to be in an inconsistent state.
Contributed by Oleg Kalnichevski <olegk at apache.org>
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/09f0e8d1/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java b/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
index 7b68eca..53855cd 100644
--- a/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
+++ b/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
@@ -47,6 +47,7 @@ import org.apache.http.annotation.ThreadSafe;
import org.apache.http.concurrent.BasicFuture;
import org.apache.http.concurrent.FutureCallback;
import org.apache.http.nio.reactor.ConnectingIOReactor;
+import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.IOSession;
import org.apache.http.nio.reactor.SessionRequest;
import org.apache.http.nio.reactor.SessionRequestCallback;
@@ -506,7 +507,9 @@ public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
this.pending.remove(request);
final RouteSpecificPool<T, C, E> pool = getPool(route);
pool.cancelled(request);
- processNextPendingRequest();
+ if (this.ioreactor.getStatus().compareTo(IOReactorStatus.ACTIVE) <= 0) {
+ processNextPendingRequest();
+ }
} finally {
this.lock.unlock();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/09f0e8d1/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java b/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
index 867962f..52cac99 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
@@ -37,6 +37,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.http.concurrent.BasicFuture;
import org.apache.http.nio.reactor.ConnectingIOReactor;
+import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.IOSession;
import org.apache.http.nio.reactor.SessionRequest;
import org.apache.http.nio.reactor.SessionRequestCallback;
@@ -240,6 +241,7 @@ public class TestNIOConnPool {
Mockito.any(SocketAddress.class),
Mockito.any(), Mockito.any(SessionRequestCallback.class))).
thenReturn(sessionRequest);
+ Mockito.when(ioreactor.getStatus()).thenReturn(IOReactorStatus.ACTIVE);
final LocalSessionPool pool = new LocalSessionPool(ioreactor, 2, 10);
final Future<LocalPoolEntry> future = pool.lease("somehost", null);