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

ARTEMIS-1335 Update Netty to 4.1.14 

Update Netty to 4.1.14
This commit is contained in:
Michael André Pearce 2017-08-09 08:51:33 +01:00 committed by Clebert Suconic
parent 8d6adac7d0
commit 684dd24cc7
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artemis-features/src/main/resources/features.xml
View File

@ -36,6 +36,7 @@
<bundle>mvn:io.netty/netty-codec/${netty.version}</bundle> <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
<bundle>mvn:io.netty/netty-handler/${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-epoll/${netty.version}</bundle>
<bundle>mvn:io.netty/netty-transport-native-unix-common/${netty.version}</bundle>
</feature> </feature>
<feature name="artemis-core" version="${pom.version}" description="ActiveMQ Artemis broker libraries"> <feature name="artemis-core" version="${pom.version}" description="ActiveMQ Artemis broker libraries">

7
artemis-journal/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBufWrapper.java
View File

@ -36,6 +36,7 @@ import io.netty.util.internal.PlatformDependent;
*/ */
public final class UnpooledUnsafeDirectByteBufWrapper extends AbstractReferenceCountedByteBuf { public final class UnpooledUnsafeDirectByteBufWrapper extends AbstractReferenceCountedByteBuf {
private static final byte ZERO = 0;
private ByteBuffer buffer; private ByteBuffer buffer;
private int arrayOffset; private int arrayOffset;
private byte[] array; private byte[] array;
@ -563,7 +564,11 @@ public final class UnpooledUnsafeDirectByteBufWrapper extends AbstractReferenceC
@Override @Override
public ByteBuf setZero(int index, int length) { public ByteBuf setZero(int index, int length) {
if (hasMemoryAddress()) { 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 { } else {
//prefer Arrays::fill here? //prefer Arrays::fill here?
UnsafeByteBufUtil.setZero(array, idx(index), length); UnsafeByteBufUtil.setZero(array, idx(index), length);

2
pom.xml
View File

@ -86,7 +86,7 @@
<jgroups.version>3.6.13.Final</jgroups.version> <jgroups.version>3.6.13.Final</jgroups.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version> <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<mockito.version>2.8.47</mockito.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> <proton.version>0.20.0</proton.version>
<resteasy.version>3.0.19.Final</resteasy.version> <resteasy.version>3.0.19.Final</resteasy.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>