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/09/18 10:00:44 UTC
httpcomponents-core git commit: Replace object creation with
reference to static final object. [Forced Update!]
Repository: httpcomponents-core
Updated Branches:
refs/heads/master cb0841fbb -> d83050b01 (forced update)
Replace object creation with reference to static final object.
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/d83050b0
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/d83050b0
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/d83050b0
Branch: refs/heads/master
Commit: d83050b0118b09b8540bd68e8a3bceee9f7a6066
Parents: cc5b62a
Author: Gary Gregory <gg...@rocketsoftware.com>
Authored: Mon Sep 17 17:11:28 2018 -0600
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Tue Sep 18 12:00:22 2018 +0200
----------------------------------------------------------------------
.../hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java | 2 +-
.../http2/impl/nio/bootstrap/Http2MultiplexingRequester.java | 3 +--
.../main/java/org/apache/hc/core5/http2/nio/pool/H2ConnPool.java | 2 +-
.../org/apache/hc/core5/testing/nio/ClientSessionEndpoint.java | 4 ++--
.../java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java | 2 +-
.../apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java | 2 +-
.../org/apache/hc/core5/http/impl/bootstrap/HttpAsyncServer.java | 3 +--
.../hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java | 4 ++--
8 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d83050b0/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
index 7929ad0..1a151ef 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractHttp2StreamMultiplexer.java
@@ -1200,7 +1200,7 @@ abstract class AbstractHttp2StreamMultiplexer implements Identifiable, HttpConne
@Override
public void close() throws IOException {
- ioSession.enqueue(new ShutdownCommand(CloseMode.GRACEFUL), Command.Priority.IMMEDIATE);
+ ioSession.enqueue(ShutdownCommand.GRACEFUL, Command.Priority.IMMEDIATE);
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d83050b0/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/Http2MultiplexingRequester.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/Http2MultiplexingRequester.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/Http2MultiplexingRequester.java
index 9225721..ae48264 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/Http2MultiplexingRequester.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/bootstrap/Http2MultiplexingRequester.java
@@ -66,7 +66,6 @@ import org.apache.hc.core5.http.nio.support.BasicClientExchangeHandler;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http2.nio.pool.H2ConnPool;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.net.URIAuthority;
import org.apache.hc.core5.reactor.Command;
import org.apache.hc.core5.reactor.IOEventHandlerFactory;
@@ -101,7 +100,7 @@ public class Http2MultiplexingRequester extends AsyncRequester{
@Override
public void execute(final IOSession session) {
- session.enqueue(new ShutdownCommand(CloseMode.GRACEFUL), Command.Priority.IMMEDIATE);
+ session.enqueue(ShutdownCommand.GRACEFUL, Command.Priority.IMMEDIATE);
}
}, DefaultAddressResolver.INSTANCE);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d83050b0/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/nio/pool/H2ConnPool.java
----------------------------------------------------------------------
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/nio/pool/H2ConnPool.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/nio/pool/H2ConnPool.java
index 8e02d16..079940b 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/nio/pool/H2ConnPool.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/nio/pool/H2ConnPool.java
@@ -88,7 +88,7 @@ public final class H2ConnPool extends AbstractIOSessionPool<HttpHost> {
final IOSession ioSession,
final CloseMode closeMode) {
if (closeMode == CloseMode.GRACEFUL) {
- ioSession.enqueue(new ShutdownCommand(CloseMode.GRACEFUL), Command.Priority.NORMAL);
+ ioSession.enqueue(ShutdownCommand.GRACEFUL, Command.Priority.NORMAL);
} else {
ioSession.close(closeMode);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d83050b0/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/ClientSessionEndpoint.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/ClientSessionEndpoint.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/ClientSessionEndpoint.java
index 184fc34..6e88fb1 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/ClientSessionEndpoint.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/ClientSessionEndpoint.java
@@ -143,7 +143,7 @@ public final class ClientSessionEndpoint implements ModalCloseable {
public void close(final CloseMode closeMode) {
if (closed.compareAndSet(false, true)) {
if (closeMode == CloseMode.GRACEFUL) {
- ioSession.enqueue(new ShutdownCommand(CloseMode.GRACEFUL), Command.Priority.NORMAL);
+ ioSession.enqueue(ShutdownCommand.GRACEFUL, Command.Priority.NORMAL);
} else {
ioSession.close(closeMode);
}
@@ -153,7 +153,7 @@ public final class ClientSessionEndpoint implements ModalCloseable {
@Override
public void close() throws IOException {
if (closed.compareAndSet(false, true)) {
- ioSession.enqueue(new ShutdownCommand(CloseMode.GRACEFUL), Command.Priority.IMMEDIATE);
+ ioSession.enqueue(ShutdownCommand.GRACEFUL, Command.Priority.IMMEDIATE);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d83050b0/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java
----------------------------------------------------------------------
diff --git a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java
index bd6c8c7..4ecd05f 100644
--- a/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java
+++ b/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/IOReactorExecutor.java
@@ -80,7 +80,7 @@ abstract class IOReactorExecutor<T extends IOReactorService> implements AutoClos
@Override
public void execute(final IOSession session) {
- session.enqueue(new ShutdownCommand(CloseMode.GRACEFUL), Command.Priority.NORMAL);
+ session.enqueue(ShutdownCommand.GRACEFUL, Command.Priority.NORMAL);
}
}))) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d83050b0/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java
index 6567c6d..f24ae59 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncRequester.java
@@ -105,7 +105,7 @@ public class HttpAsyncRequester extends AsyncRequester implements ConnPoolContro
@Override
public void execute(final IOSession session) {
- session.enqueue(new ShutdownCommand(CloseMode.GRACEFUL), Command.Priority.IMMEDIATE);
+ session.enqueue(ShutdownCommand.GRACEFUL, Command.Priority.IMMEDIATE);
}
}, DefaultAddressResolver.INSTANCE);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d83050b0/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncServer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncServer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncServer.java
index d4e848f..1077031 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncServer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/bootstrap/HttpAsyncServer.java
@@ -30,7 +30,6 @@ import org.apache.hc.core5.annotation.Internal;
import org.apache.hc.core5.function.Callback;
import org.apache.hc.core5.function.Decorator;
import org.apache.hc.core5.http.nio.command.ShutdownCommand;
-import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.Command;
import org.apache.hc.core5.reactor.IOEventHandlerFactory;
import org.apache.hc.core5.reactor.IOReactorConfig;
@@ -57,7 +56,7 @@ public class HttpAsyncServer extends AsyncServer {
@Override
public void execute(final IOSession session) {
- session.enqueue(new ShutdownCommand(CloseMode.GRACEFUL), Command.Priority.NORMAL);
+ session.enqueue(ShutdownCommand.GRACEFUL, Command.Priority.NORMAL);
}
});
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d83050b0/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
index b8349b1..9972710 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/AbstractHttp1StreamDuplexer.java
@@ -144,7 +144,7 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
void shutdownSession(final CloseMode closeMode) {
if (closeMode == CloseMode.GRACEFUL) {
connState = ConnectionState.GRACEFUL_SHUTDOWN;
- ioSession.enqueue(new ShutdownCommand(CloseMode.GRACEFUL), Command.Priority.NORMAL);
+ ioSession.enqueue(ShutdownCommand.GRACEFUL, Command.Priority.NORMAL);
} else {
connState = ConnectionState.SHUTDOWN;
ioSession.close();
@@ -546,7 +546,7 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
@Override
public void close() throws IOException {
- ioSession.enqueue(new ShutdownCommand(CloseMode.GRACEFUL), Command.Priority.NORMAL);
+ ioSession.enqueue(ShutdownCommand.GRACEFUL, Command.Priority.NORMAL);
}
@Override