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 2018/10/17 11:37:50 UTC
httpcomponents-client git commit: Simplified
ManagedAsyncClientConnection interface
Repository: httpcomponents-client
Updated Branches:
refs/heads/master 447e276fb -> a1d6db5ec
Simplified ManagedAsyncClientConnection interface
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/a1d6db5e
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/a1d6db5e
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/a1d6db5e
Branch: refs/heads/master
Commit: a1d6db5ec37d74b6a3cb45ae1abd42d791c010da
Parents: 447e276
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Wed Oct 17 13:16:29 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Wed Oct 17 13:16:29 2018 +0200
----------------------------------------------------------------------
.../impl/nio/DefaultManagedAsyncClientConnection.java | 12 ++----------
.../impl/nio/PoolingAsyncClientConnectionManager.java | 9 ++++++---
.../client5/http/nio/ManagedAsyncClientConnection.java | 4 +---
3 files changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/a1d6db5e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java
index 7022d27..26d4a15 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java
@@ -178,22 +178,14 @@ final class DefaultManagedAsyncClientConnection implements ManagedAsyncClientCon
}
@Override
- public void submitPriorityCommand(final Command command) {
+ public void submitCommand(final Command command, final Command.Priority priority) {
if (log.isDebugEnabled()) {
- log.debug(getId() + ": priority command " + command);
+ log.debug(getId() + ": " + command.getClass().getSimpleName() + " with " + priority + " priority");
}
ioSession.enqueue(command, Command.Priority.IMMEDIATE);
}
@Override
- public void submitCommand(final Command command) {
- if (log.isDebugEnabled()) {
- log.debug(getId() + ": command " + command);
- }
- ioSession.enqueue(command, Command.Priority.NORMAL);
- }
-
- @Override
public void passivate() {
ioSession.setSocketTimeoutMillis(0);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/a1d6db5e/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
index 3c28d72..94570c2 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
@@ -73,6 +73,7 @@ import org.apache.hc.core5.pool.PoolEntry;
import org.apache.hc.core5.pool.PoolReusePolicy;
import org.apache.hc.core5.pool.PoolStats;
import org.apache.hc.core5.pool.StrictConnPool;
+import org.apache.hc.core5.reactor.Command;
import org.apache.hc.core5.reactor.ConnectionInitiator;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.Asserts;
@@ -247,7 +248,7 @@ public class PoolingAsyncClientConnectionManager implements AsyncClientConnectio
poolEntry.getUpdated() + timeValue.toMillis() <= System.currentTimeMillis()) {
final ProtocolVersion protocolVersion = connection.getProtocolVersion();
if (HttpVersion.HTTP_2_0.greaterEquals(protocolVersion)) {
- connection.submitPriorityCommand(new PingCommand(new BasicPingHandler(new Callback<Boolean>() {
+ connection.submitCommand(new PingCommand(new BasicPingHandler(new Callback<Boolean>() {
@Override
public void execute(final Boolean result) {
@@ -260,7 +261,7 @@ public class PoolingAsyncClientConnectionManager implements AsyncClientConnectio
leaseCompleted(poolEntry);
}
- })));
+ })), Command.Priority.IMMEDIATE);
} else {
if (!connection.isOpen()) {
if (log.isDebugEnabled()) {
@@ -564,7 +565,9 @@ public class PoolingAsyncClientConnectionManager implements AsyncClientConnectio
log.debug(id + ": executing exchange " + ConnPoolSupport.getId(exchangeHandler) +
" over " + ConnPoolSupport.getId(connection));
}
- connection.submitCommand(new RequestExecutionCommand(exchangeHandler, pushHandlerFactory, context));
+ connection.submitCommand(
+ new RequestExecutionCommand(exchangeHandler, pushHandlerFactory, context),
+ Command.Priority.NORMAL);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/a1d6db5e/httpclient5/src/main/java/org/apache/hc/client5/http/nio/ManagedAsyncClientConnection.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/nio/ManagedAsyncClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/nio/ManagedAsyncClientConnection.java
index 6a14f20..4f88f93 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/nio/ManagedAsyncClientConnection.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/nio/ManagedAsyncClientConnection.java
@@ -35,9 +35,7 @@ import org.apache.hc.core5.reactor.ssl.TransportSecurityLayer;
@Internal
public interface ManagedAsyncClientConnection extends HttpConnection, TransportSecurityLayer {
- void submitPriorityCommand(Command command);
-
- void submitCommand(Command command);
+ void submitCommand(Command command, Command.Priority priority);
/**
* Puts the connection into idle mode.