Update netty
This commit is contained in:
parent
a4beebf355
commit
9ba0b16f41
|
@ -273,8 +273,7 @@ class MemSegBuffer extends AdaptableBuffer<MemSegBuffer> implements Buffer, Read
|
||||||
}
|
}
|
||||||
// </editor-fold>
|
// </editor-fold>
|
||||||
|
|
||||||
@Override
|
private long nativeAddress() {
|
||||||
public long nativeAddress() {
|
|
||||||
if (!isAccessible()) {
|
if (!isAccessible()) {
|
||||||
throw bufferIsClosed(this);
|
throw bufferIsClosed(this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@ package io.netty.buffer.api.tests;
|
||||||
|
|
||||||
import io.netty.buffer.api.Buffer;
|
import io.netty.buffer.api.Buffer;
|
||||||
import io.netty.buffer.api.BufferAllocator;
|
import io.netty.buffer.api.BufferAllocator;
|
||||||
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
import org.junit.jupiter.params.ParameterizedTest;
|
import org.junit.jupiter.params.ParameterizedTest;
|
||||||
import org.junit.jupiter.params.provider.MethodSource;
|
import org.junit.jupiter.params.provider.MethodSource;
|
||||||
|
|
||||||
|
@ -233,7 +234,12 @@ public class BufferBulkAccessTest extends BufferTestSupport {
|
||||||
public void heapBufferMustHaveZeroAddress(Fixture fixture) {
|
public void heapBufferMustHaveZeroAddress(Fixture fixture) {
|
||||||
try (BufferAllocator allocator = fixture.createAllocator();
|
try (BufferAllocator allocator = fixture.createAllocator();
|
||||||
Buffer buf = allocator.allocate(8)) {
|
Buffer buf = allocator.allocate(8)) {
|
||||||
assertThat(buf.nativeAddress()).isZero();
|
AtomicLong nativeAddress = new AtomicLong();
|
||||||
|
buf.forEachWritable(0, (index, component) -> {
|
||||||
|
nativeAddress.set(component.writableNativeAddress());
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
assertThat(nativeAddress.get()).isZero();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -242,7 +248,12 @@ public class BufferBulkAccessTest extends BufferTestSupport {
|
||||||
public void directBufferMustHaveNonZeroAddress(Fixture fixture) {
|
public void directBufferMustHaveNonZeroAddress(Fixture fixture) {
|
||||||
try (BufferAllocator allocator = fixture.createAllocator();
|
try (BufferAllocator allocator = fixture.createAllocator();
|
||||||
Buffer buf = allocator.allocate(8)) {
|
Buffer buf = allocator.allocate(8)) {
|
||||||
assertThat(buf.nativeAddress()).isNotZero();
|
AtomicLong nativeAddress = new AtomicLong();
|
||||||
|
buf.forEachWritable(0, (index, component) -> {
|
||||||
|
nativeAddress.set(component.writableNativeAddress());
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
assertThat(nativeAddress.get()).isNotZero();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,17 +22,25 @@ import io.netty.buffer.api.BufferReadOnlyException;
|
||||||
import io.netty.buffer.api.CompositeBuffer;
|
import io.netty.buffer.api.CompositeBuffer;
|
||||||
import io.netty.buffer.api.Send;
|
import io.netty.buffer.api.Send;
|
||||||
import io.netty.buffer.api.internal.ResourceSupport;
|
import io.netty.buffer.api.internal.ResourceSupport;
|
||||||
|
import io.netty.buffer.api.internal.Statics;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.junit.jupiter.params.ParameterizedTest;
|
import org.junit.jupiter.params.ParameterizedTest;
|
||||||
import org.junit.jupiter.params.provider.MethodSource;
|
import org.junit.jupiter.params.provider.MethodSource;
|
||||||
|
|
||||||
import static io.netty.buffer.api.internal.Statics.acquire;
|
|
||||||
import static io.netty.buffer.api.internal.Statics.isOwned;
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
|
||||||
public class BufferCompositionTest extends BufferTestSupport {
|
public class BufferCompositionTest extends BufferTestSupport {
|
||||||
|
|
||||||
|
private static boolean isOwned(CompositeBuffer composite) {
|
||||||
|
return (Statics.isOwned((ResourceSupport<?, ?>) composite));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isOwned(Buffer composite) {
|
||||||
|
return (Statics.isOwned((ResourceSupport<?, ?>) composite));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void compositeBuffersCannotHaveDuplicateComponents() {
|
public void compositeBuffersCannotHaveDuplicateComponents() {
|
||||||
try (BufferAllocator allocator = BufferAllocator.onHeapUnpooled()) {
|
try (BufferAllocator allocator = BufferAllocator.onHeapUnpooled()) {
|
||||||
|
@ -56,7 +64,7 @@ public class BufferCompositionTest extends BufferTestSupport {
|
||||||
allocator.allocate(8).send(),
|
allocator.allocate(8).send(),
|
||||||
allocator.allocate(8).send())) {
|
allocator.allocate(8).send())) {
|
||||||
assertEquals(24, composite.capacity());
|
assertEquals(24, composite.capacity());
|
||||||
assertTrue(isOwned((ResourceSupport<?, ?>) composite));
|
assertTrue(isOwned(composite));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -113,7 +121,7 @@ public class BufferCompositionTest extends BufferTestSupport {
|
||||||
Buffer a = allocator.allocate(8);
|
Buffer a = allocator.allocate(8);
|
||||||
Buffer b = allocator.allocate(8);
|
Buffer b = allocator.allocate(8);
|
||||||
CompositeBuffer composed = CompositeBuffer.compose(allocator, a.send())) {
|
CompositeBuffer composed = CompositeBuffer.compose(allocator, a.send())) {
|
||||||
try (Buffer ignore = acquire(composed)) {
|
try (Buffer ignore = Statics.acquire((ResourceSupport<?, ?>) composed)) {
|
||||||
var exc = assertThrows(IllegalStateException.class, () -> composed.extendWith(b.send()));
|
var exc = assertThrows(IllegalStateException.class, () -> composed.extendWith(b.send()));
|
||||||
assertThat(exc).hasMessageContaining("owned");
|
assertThat(exc).hasMessageContaining("owned");
|
||||||
}
|
}
|
||||||
|
|
|
@ -617,6 +617,11 @@ public abstract class ByteToMessageDecoder extends ChannelHandlerAdapter {
|
||||||
return ctx.alloc();
|
return ctx.alloc();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BufferAllocator bufferAllocator() {
|
||||||
|
return ctx.bufferAllocator();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public <T> Attribute<T> attr(AttributeKey<T> key) {
|
public <T> Attribute<T> attr(AttributeKey<T> key) {
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -71,7 +71,7 @@
|
||||||
<netty.version>5.0.0.Final-SNAPSHOT</netty.version>
|
<netty.version>5.0.0.Final-SNAPSHOT</netty.version>
|
||||||
<netty.build.version>29</netty.build.version>
|
<netty.build.version>29</netty.build.version>
|
||||||
<!-- Java version for source and bytecode compatibility. -->
|
<!-- Java version for source and bytecode compatibility. -->
|
||||||
<java.compatibility>11</java.compatibility>
|
<java.compatibility>17</java.compatibility>
|
||||||
<!-- Java version actually used to perform the build; compiling and testing. -->
|
<!-- Java version actually used to perform the build; compiling and testing. -->
|
||||||
<java.version>17</java.version>
|
<java.version>17</java.version>
|
||||||
<junit.version>5.7.0</junit.version>
|
<junit.version>5.7.0</junit.version>
|
||||||
|
|
Loading…
Reference in New Issue