Upgraded HttpCore dependency to version 5.0-beta10
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java
index 9f5e722..a1673c4 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java
@@ -687,7 +687,7 @@
final HttpHost redirectTarget = start();
final H2TestServer secondServer = new H2TestServer(IOReactorConfig.DEFAULT,
- scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null);
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null, null, null);
try {
secondServer.register("/redirect/*", new Supplier<AsyncServerExchangeHandler>() {
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractServerTestBase.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractServerTestBase.java
index 98eea6b..49671bd 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractServerTestBase.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractServerTestBase.java
@@ -64,7 +64,7 @@
IOReactorConfig.custom()
.setSoTimeout(TIMEOUT)
.build(),
- scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null);
+ scheme == URIScheme.HTTPS ? SSLTestContexts.createServerSSLContext() : null, null, null);
server.register("/echo/*", new Supplier<AsyncServerExchangeHandler>() {
@Override
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java
index de92075..65b7f67 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java
@@ -149,7 +149,7 @@
public boolean validateConnection() {
if (reusable) {
final Endpoint endpoint = sessionRef.get();
- return endpoint != null && !endpoint.session.isClosed();
+ return endpoint != null && endpoint.session.isOpen();
}
final Endpoint endpoint = sessionRef.getAndSet(null);
if (endpoint != null) {
@@ -161,7 +161,7 @@
@Override
public boolean isEndpointConnected() {
final Endpoint endpoint = sessionRef.get();
- return endpoint != null && !endpoint.session.isClosed();
+ return endpoint != null && endpoint.session.isOpen();
}
@@ -178,7 +178,7 @@
final HttpClientContext context,
final FutureCallback<AsyncExecRuntime> callback) {
final Endpoint endpoint = ensureValid();
- if (!endpoint.session.isClosed()) {
+ if (endpoint.session.isOpen()) {
callback.completed(this);
return Operations.nonCancellable();
}
@@ -227,7 +227,7 @@
final ComplexCancellable complexCancellable = new ComplexCancellable();
final Endpoint endpoint = ensureValid();
final IOSession session = endpoint.session;
- if (!session.isClosed()) {
+ if (session.isOpen()) {
if (log.isDebugEnabled()) {
log.debug(ConnPoolSupport.getId(endpoint) + ": start execution " + id);
}
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
index ebf515b..9156915 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
@@ -177,11 +177,6 @@
}
@Override
- public boolean isClosed() {
- return this.session.isClosed();
- }
-
- @Override
public void close(final CloseMode closeMode) {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Close " + closeMode);
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 e883638..a2bda68 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
@@ -97,7 +97,7 @@
@Override
public boolean isOpen() {
- return !ioSession.isClosed();
+ return ioSession.isOpen();
}
@Override
diff --git a/pom.xml b/pom.xml
index 92d85d3..9b55225 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
- <httpcore.version>5.0-beta9</httpcore.version>
+ <httpcore.version>5.0-beta10</httpcore.version>
<log4j.version>2.9.1</log4j.version>
<commons-codec.version>1.13</commons-codec.version>
<conscrypt.version>1.4.1</conscrypt.version>
