Repository: reef Updated Branches: refs/heads/master 365f36ab2 -> b8cecb612
[REEF-1875] Upgrade Netty depenency to 4.1.15Final JIRA: [REEF-1875](https://issues.apache.org/jira/browse/REEF-1875) Pull request: This closes #1371 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/b8cecb61 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/b8cecb61 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/b8cecb61 Branch: refs/heads/master Commit: b8cecb612feaa96a86c031df0b6f6f7306f215b2 Parents: 365f36a Author: nhne <[email protected]> Authored: Thu Aug 31 14:44:44 2017 +0900 Committer: Byung-Gon Chun <[email protected]> Committed: Fri Sep 1 18:37:35 2017 +0900 ---------------------------------------------------------------------- .../wake/remote/transport/netty/ChunkedReadWriteHandler.java | 8 ++++---- .../wake/remote/transport/netty/NettyMessagingTransport.java | 2 +- pom.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/b8cecb61/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/ChunkedReadWriteHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/ChunkedReadWriteHandler.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/ChunkedReadWriteHandler.java index bee3374..e27de5d 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/ChunkedReadWriteHandler.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/ChunkedReadWriteHandler.java @@ -147,9 +147,9 @@ public class ChunkedReadWriteHandler extends ChunkedWriteHandler { */ private byte[] sizeAsByteArr(final int size) { final byte[] ret = new byte[INT_SIZE]; - final ByteBuf intBuffer = Unpooled.wrappedBuffer(ret).order(Unpooled.LITTLE_ENDIAN); + final ByteBuf intBuffer = Unpooled.wrappedBuffer(ret); intBuffer.clear(); - intBuffer.writeInt(size); + intBuffer.writeIntLE(size); intBuffer.release(); return ret; } @@ -170,8 +170,8 @@ public class ChunkedReadWriteHandler extends ChunkedWriteHandler { return 0; } - final ByteBuf intBuffer = Unpooled.wrappedBuffer(data, offset, INT_SIZE).order(Unpooled.LITTLE_ENDIAN); - final int ret = intBuffer.readInt(); + final ByteBuf intBuffer = Unpooled.wrappedBuffer(data, offset, INT_SIZE); + final int ret = intBuffer.readIntLE(); intBuffer.release(); return ret; http://git-wip-us.apache.org/repos/asf/reef/blob/b8cecb61/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java index 2643030..08ab08f 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/transport/netty/NettyMessagingTransport.java @@ -320,7 +320,7 @@ public final class NettyMessagingTransport implements Transport { } break; } catch (final Exception e) { - if (e.getClass().getSimpleName().compareTo("ConnectException") == 0) { + if (e.getClass().getSimpleName().compareTo("AnnotatedConnectException") == 0) { LOG.log(Level.WARNING, "Connection refused. Retry {0} of {1}", new Object[]{i + 1, this.numberOfTries}); synchronized (flag) { http://git-wip-us.apache.org/repos/asf/reef/blob/b8cecb61/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 588411f..3b7870c 100644 --- a/pom.xml +++ b/pom.xml @@ -703,7 +703,7 @@ under the License. <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> - <version>4.0.21.Final</version> + <version>4.1.15.Final</version> </dependency> <dependency>
