diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml index fc9bb78cd3..cf5a2a9a24 100644 --- a/artemis-features/src/main/resources/features.xml +++ b/artemis-features/src/main/resources/features.xml @@ -36,6 +36,7 @@ mvn:io.netty/netty-codec/${netty.version} mvn:io.netty/netty-handler/${netty.version} mvn:io.netty/netty-transport-native-epoll/${netty.version} + mvn:io.netty/netty-transport-native-unix-common/${netty.version} 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 a4346dc0c8..3ec816530a 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); diff --git a/pom.xml b/pom.xml index 4374225fa0..15d701ee8a 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 3.6.13.Final 2.4 2.8.47 - 4.1.9.Final + 4.1.14.Final 0.20.0 3.0.19.Final 1.7.21