Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgraded HttpCore dependency to version 5.0-beta10

This commit is contained in:
Oleg Kalnichevski 2019-10-31 15:15:53 +01:00
parent 47ffb6a5f8
commit d62616bb29
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractHttpAsyncRedirectsTest.java
View File

@ -687,7 +687,7 @@ public abstract class AbstractHttpAsyncRedirectsTest <T extends CloseableHttpAsy
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>() {

2
httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/AbstractServerTestBase.java
View File

@ -64,7 +64,7 @@ public abstract class AbstractServerTestBase {
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

8
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java
View File

@ -149,7 +149,7 @@ class InternalH2AsyncExecRuntime implements AsyncExecRuntime {
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 @@ class InternalH2AsyncExecRuntime implements AsyncExecRuntime {
@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 @@ class InternalH2AsyncExecRuntime implements AsyncExecRuntime {
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 @@ class InternalH2AsyncExecRuntime implements AsyncExecRuntime {
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);
}

5
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
View File

@ -176,11 +176,6 @@ class LoggingIOSession implements ProtocolIOSession {
return this.session.getStatus();
}
@Override
public boolean isClosed() {
return this.session.isClosed();
}
@Override
public void close(final CloseMode closeMode) {
if (this.log.isDebugEnabled()) {

2
httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java
View File

@ -97,7 +97,7 @@ final class DefaultManagedAsyncClientConnection implements ManagedAsyncClientCon
@Override
public boolean isOpen() {
return !ioSession.isClosed();
return ioSession.isOpen();
}
@Override

2
pom.xml
View File

@ -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>