ARTEMIS-1335 Update Netty to 4.1.14 Update Netty to 4.1.14
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/684dd24c Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/684dd24c Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/684dd24c Branch: refs/heads/master Commit: 684dd24cc7be878d234f6fb75678122273035308 Parents: 8d6adac Author: Michael André Pearce <[email protected]> Authored: Wed Aug 9 08:51:33 2017 +0100 Committer: Clebert Suconic <[email protected]> Committed: Wed Aug 9 15:20:49 2017 -0400 ---------------------------------------------------------------------- artemis-features/src/main/resources/features.xml | 1 + .../io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java | 7 ++++++- pom.xml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/684dd24c/artemis-features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml index fc9bb78..cf5a2a9 100644 --- a/artemis-features/src/main/resources/features.xml +++ b/artemis-features/src/main/resources/features.xml @@ -36,6 +36,7 @@ <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle> <bundle>mvn:io.netty/netty-handler/${netty.version}</bundle> <bundle>mvn:io.netty/netty-transport-native-epoll/${netty.version}</bundle> + <bundle>mvn:io.netty/netty-transport-native-unix-common/${netty.version}</bundle> </feature> <feature name="artemis-core" version="${pom.version}" description="ActiveMQ Artemis broker libraries"> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/684dd24c/artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java ---------------------------------------------------------------------- diff --git a/artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java b/artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java index a4346dc..3ec8165 100644 --- a/artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java +++ b/artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java @@ -36,6 +36,7 @@ import io.netty.util.internal.PlatformDependent; */ public final class UnpooledUnsafeDirectByteBufWrapper extends AbstractReferenceCountedByteBuf { + private static final byte ZERO = 0; private ByteBuffer buffer; private int arrayOffset; private byte[] array; @@ -563,7 +564,11 @@ public final class UnpooledUnsafeDirectByteBufWrapper extends AbstractReferenceC @Override public ByteBuf setZero(int index, int length) { if (hasMemoryAddress()) { - UnsafeByteBufUtil.setZero(this, addr(index), index, length); + if (length == 0) { + return this; + } + this.checkIndex(index, length); + PlatformDependent.setMemory(addr(index), length, ZERO); } else { //prefer Arrays::fill here? UnsafeByteBufUtil.setZero(array, idx(index), length); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/684dd24c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4374225..15d701e 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ <jgroups.version>3.6.13.Final</jgroups.version> <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version> <mockito.version>2.8.47</mockito.version> - <netty.version>4.1.9.Final</netty.version> + <netty.version>4.1.14.Final</netty.version> <proton.version>0.20.0</proton.version> <resteasy.version>3.0.19.Final</resteasy.version> <slf4j.version>1.7.21</slf4j.version>
