Upgrade httpcore.version to 5.0-beta9
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 a0256c8..ebf515b 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
@@ -159,6 +159,11 @@
}
@Override
+ public boolean isOpen() {
+ return channel.isOpen();
+ }
+
+ @Override
public void close() {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Close");
@@ -258,6 +263,16 @@
return this.id + " " + this.session.toString();
}
+ @Override
+ public int read(final ByteBuffer dst) throws IOException {
+ return channel.read(dst);
+ }
+
+ @Override
+ public int write(final ByteBuffer src) throws IOException {
+ return channel.write(src);
+ }
+
class LoggingByteChannel implements ByteChannel {
@Override
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 39f3284..e883638 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
@@ -46,7 +46,6 @@
import org.apache.hc.core5.reactor.Command;
import org.apache.hc.core5.reactor.IOEventHandler;
import org.apache.hc.core5.reactor.IOSession;
-import org.apache.hc.core5.reactor.ProtocolLayer;
import org.apache.hc.core5.reactor.ssl.SSLBufferMode;
import org.apache.hc.core5.reactor.ssl.SSLSessionInitializer;
import org.apache.hc.core5.reactor.ssl.SSLSessionVerifier;
@@ -123,22 +122,18 @@
@Override
public EndpointDetails getEndpointDetails() {
- if (ioSession instanceof ProtocolLayer) {
- final IOEventHandler handler = ((ProtocolLayer) ioSession).getHandler();
- if (handler instanceof HttpConnection) {
- return ((HttpConnection) handler).getEndpointDetails();
- }
+ final IOEventHandler handler = ioSession.getHandler();
+ if (handler instanceof HttpConnection) {
+ return ((HttpConnection) handler).getEndpointDetails();
}
return null;
}
@Override
public ProtocolVersion getProtocolVersion() {
- if (ioSession instanceof ProtocolLayer) {
- final IOEventHandler handler = ((ProtocolLayer) ioSession).getHandler();
- if (handler instanceof HttpConnection) {
- return ((HttpConnection) handler).getProtocolVersion();
- }
+ final IOEventHandler handler = ioSession.getHandler();
+ if (handler instanceof HttpConnection) {
+ return ((HttpConnection) handler).getProtocolVersion();
}
return HttpVersion.DEFAULT;
}
diff --git a/pom.xml b/pom.xml
index 88075c7..25b6c60 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-beta8</httpcore.version>
+ <httpcore.version>5.0-beta9</httpcore.version>
<log4j.version>2.9.1</log4j.version>
<commons-codec.version>1.12</commons-codec.version>
<conscrypt.version>1.4.1</conscrypt.version>
