Upgrade to Netty 4.1.43 (#48484)
With this update we can remove the mitigation in our custom allocator which forces heap buffer allocations.
This commit is contained in:
parent
7fc413c22c
commit
45e42f4e18
|
@ -21,7 +21,7 @@ slf4j = 1.6.2
|
||||||
# when updating the JNA version, also update the version in buildSrc/build.gradle
|
# when updating the JNA version, also update the version in buildSrc/build.gradle
|
||||||
jna = 4.5.1
|
jna = 4.5.1
|
||||||
|
|
||||||
netty = 4.1.42.Final
|
netty = 4.1.43.Final
|
||||||
joda = 2.10.3
|
joda = 2.10.3
|
||||||
|
|
||||||
# when updating this version, you need to ensure compatibility with:
|
# when updating this version, you need to ensure compatibility with:
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
6e6fc9178d1f1401aa0d6b843341efb91720f2cd
|
|
|
@ -0,0 +1 @@
|
||||||
|
c0d142260a32709523e3bcf0d015b193f2ff2df4
|
|
@ -1 +0,0 @@
|
||||||
b1d5ed85a558fbbadc2783f869fbd0adcd32b07b
|
|
|
@ -0,0 +1 @@
|
||||||
|
44731a5739c40a8434c43e1303e9196f23da67fa
|
|
@ -1 +0,0 @@
|
||||||
5f71267aa784d0e6c5ec09fb988339d244b205a0
|
|
|
@ -0,0 +1 @@
|
||||||
|
07320f9db621dc51b79807a4e5094665f260432c
|
|
@ -1 +0,0 @@
|
||||||
e02700b574d3a0e2100308f971f0753ac8700e7c
|
|
|
@ -0,0 +1 @@
|
||||||
|
ccb6f627ded1bb2671a66a84506174d240c7bec8
|
|
@ -1 +0,0 @@
|
||||||
fc6546be5df552d9729f008d8d41a6dee28127aa
|
|
|
@ -0,0 +1 @@
|
||||||
|
f83ac0492d44057d07ec6d40cf79e8e2de949836
|
|
@ -1 +0,0 @@
|
||||||
ccaacf418a9e486b65e82c47bed66439119c5fdb
|
|
|
@ -0,0 +1 @@
|
||||||
|
94ae5a7e595fdc29dac254014e3159d3572d7e44
|
|
@ -1 +0,0 @@
|
||||||
857502e863c02c829fdafea61c3fda6bda01d0af
|
|
|
@ -0,0 +1 @@
|
||||||
|
781cd7cfc1118bdfe1538f39cc1f4d07d6254094
|
|
@ -60,10 +60,6 @@ public class NettyAllocator {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean useCopySocket() {
|
|
||||||
return ALLOCATOR instanceof NoDirectBuffers;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ByteBufAllocator getAllocator() {
|
public static ByteBufAllocator getAllocator() {
|
||||||
return ALLOCATOR;
|
return ALLOCATOR;
|
||||||
}
|
}
|
||||||
|
@ -148,26 +144,17 @@ public class NettyAllocator {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ByteBuf directBuffer() {
|
public ByteBuf directBuffer() {
|
||||||
// TODO: Currently the Netty SslHandler requests direct ByteBufs even when interacting with the
|
throw new UnsupportedOperationException("Direct buffers not supported");
|
||||||
// JDK SSLEngine. This will be fixed in a future version of Netty. For now, return a heap
|
|
||||||
// ByteBuf. After a Netty upgrade, return to throwing UnsupportedOperationException
|
|
||||||
return heapBuffer();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ByteBuf directBuffer(int initialCapacity) {
|
public ByteBuf directBuffer(int initialCapacity) {
|
||||||
// TODO: Currently the Netty SslHandler requests direct ByteBufs even when interacting with the
|
throw new UnsupportedOperationException("Direct buffers not supported");
|
||||||
// JDK SSLEngine. This will be fixed in a future version of Netty. For now, return a heap
|
|
||||||
// ByteBuf. After a Netty upgrade, return to throwing UnsupportedOperationException
|
|
||||||
return heapBuffer(initialCapacity);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ByteBuf directBuffer(int initialCapacity, int maxCapacity) {
|
public ByteBuf directBuffer(int initialCapacity, int maxCapacity) {
|
||||||
// TODO: Currently the Netty SslHandler requests direct ByteBufs even when interacting with the
|
throw new UnsupportedOperationException("Direct buffers not supported");
|
||||||
// JDK SSLEngine. This will be fixed in a future version of Netty. For now, return a heap
|
|
||||||
// ByteBuf. After a Netty upgrade, return to throwing UnsupportedOperationException
|
|
||||||
return heapBuffer(initialCapacity, maxCapacity);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
6e6fc9178d1f1401aa0d6b843341efb91720f2cd
|
|
|
@ -0,0 +1 @@
|
||||||
|
c0d142260a32709523e3bcf0d015b193f2ff2df4
|
|
@ -1 +0,0 @@
|
||||||
b1d5ed85a558fbbadc2783f869fbd0adcd32b07b
|
|
|
@ -0,0 +1 @@
|
||||||
|
44731a5739c40a8434c43e1303e9196f23da67fa
|
|
@ -1 +0,0 @@
|
||||||
5f71267aa784d0e6c5ec09fb988339d244b205a0
|
|
|
@ -0,0 +1 @@
|
||||||
|
07320f9db621dc51b79807a4e5094665f260432c
|
|
@ -1 +0,0 @@
|
||||||
e02700b574d3a0e2100308f971f0753ac8700e7c
|
|
|
@ -0,0 +1 @@
|
||||||
|
ccb6f627ded1bb2671a66a84506174d240c7bec8
|
|
@ -1 +0,0 @@
|
||||||
fc6546be5df552d9729f008d8d41a6dee28127aa
|
|
|
@ -0,0 +1 @@
|
||||||
|
f83ac0492d44057d07ec6d40cf79e8e2de949836
|
|
@ -1 +0,0 @@
|
||||||
ccaacf418a9e486b65e82c47bed66439119c5fdb
|
|
|
@ -0,0 +1 @@
|
||||||
|
94ae5a7e595fdc29dac254014e3159d3572d7e44
|
|
@ -1 +0,0 @@
|
||||||
857502e863c02c829fdafea61c3fda6bda01d0af
|
|
|
@ -0,0 +1 @@
|
||||||
|
781cd7cfc1118bdfe1538f39cc1f4d07d6254094
|
Loading…
Reference in New Issue