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/04/12 13:35:49 UTC
[2/2] httpcomponents-core git commit: Made resource handling of
AbstractHttp1StreamDuplexer consistent with that of
AbstractHttp2StreamMultiplexer;
AbstractHttp1StreamDuplexer no longer implements ResourceHolder
Made resource handling of AbstractHttp1StreamDuplexer consistent with that of AbstractHttp2StreamMultiplexer; AbstractHttp1StreamDuplexer no longer implements ResourceHolder
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/409eda4a
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/409eda4a
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/409eda4a
Branch: refs/heads/master
Commit: 409eda4a1de149cc69b39a0f091cbb43c195d5c1
Parents: f1e04cd
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Wed Mar 28 20:36:38 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Thu Apr 12 15:33:28 2018 +0200
----------------------------------------------------------------------
.../impl/nio/AbstractHttp1StreamDuplexer.java | 5 +----
.../impl/nio/ClientHttp1StreamDuplexer.java | 20 --------------------
.../impl/nio/ServerHttp1StreamDuplexer.java | 20 --------------------
3 files changed, 1 insertion(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/409eda4a/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 22672fd..f5d8064 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
@@ -66,7 +66,6 @@ import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.NHttpMessageParser;
import org.apache.hc.core5.http.nio.NHttpMessageWriter;
-import org.apache.hc.core5.http.nio.ResourceHolder;
import org.apache.hc.core5.http.nio.SessionInputBuffer;
import org.apache.hc.core5.http.nio.SessionOutputBuffer;
import org.apache.hc.core5.http.nio.command.ExecutionCommand;
@@ -80,7 +79,7 @@ import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.Identifiable;
abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage, OutgoingMessage extends HttpMessage>
- implements Identifiable, HttpConnection, ResourceHolder {
+ implements Identifiable, HttpConnection {
private enum ConnectionState { READY, ACTIVE, GRACEFUL_SHUTDOWN, SHUTDOWN}
@@ -388,7 +387,6 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
}
if (connState.compareTo(ConnectionState.SHUTDOWN) >= 0) {
ioSession.close();
- releaseResources();
}
}
@@ -432,7 +430,6 @@ abstract class AbstractHttp1StreamDuplexer<IncomingMessage extends HttpMessage,
break;
}
}
- releaseResources();
}
void requestShutdown(final ShutdownType shutdownType) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/409eda4a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
index 67559b5..911910b 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ClientHttp1StreamDuplexer.java
@@ -167,26 +167,6 @@ public class ClientHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
}
@Override
- public void releaseResources() {
- if (incoming != null) {
- incoming.releaseResources();
- incoming = null;
- }
- if (outgoing != null) {
- outgoing.releaseResources();
- outgoing = null;
- }
- for (;;) {
- final ClientHttp1StreamHandler handler = pipeline.poll();
- if (handler != null) {
- handler.releaseResources();
- } else {
- break;
- }
- }
- }
-
- @Override
void terminate(final Exception exception) {
if (incoming != null) {
incoming.failed(exception);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/409eda4a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
index f2fcc42..b277da2 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/nio/ServerHttp1StreamDuplexer.java
@@ -167,26 +167,6 @@ public class ServerHttp1StreamDuplexer extends AbstractHttp1StreamDuplexer<HttpR
}
@Override
- public void releaseResources() {
- if (incoming != null) {
- incoming.releaseResources();
- incoming = null;
- }
- if (outgoing != null) {
- outgoing.releaseResources();
- outgoing = null;
- }
- for (;;) {
- final ServerHttp1StreamHandler handler = pipeline.poll();
- if (handler != null) {
- handler.releaseResources();
- } else {
- break;
- }
- }
- }
-
- @Override
void terminate(final Exception exception) {
if (incoming != null) {
incoming.failed(exception);