andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly close EmbeddedChannel and release buffers in SnappyFrameDecoderTest (#9851)

Browse Source 
Motivation:

We did not correctly close the `EmbeddedChannel` which would lead to not have `handlerRemoved(...)` called. This can lead to leaks. Beside this we also did not correctly consume produced data which could also show up as a leak.

Modifications:

- Always call `EmbeddedChannel.finish()`
- Ensure we consume all produced data and release it

Result:

No more leaks in test. This showed up in https://github.com/netty/netty/pull/9850#issuecomment-562504863.
This commit is contained in:
Norman Maurer 2019-12-06 12:02:08 +01:00
parent 254732b43c
commit bcb6d38026
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
codec/src/test/java/io/netty/handler/codec/compression/SnappyFrameDecoderTest.java
View File

@ -37,7 +37,8 @@ public class SnappyFrameDecoderTest {
0x03, 0x01, 0x00, 0x00, 0x00
});
channel.writeInbound(in);
assertFalse(channel.writeInbound(in));
assertFalse(channel.finish());
}
@Test(expected = DecompressionException.class)
@ -46,7 +47,8 @@ public class SnappyFrameDecoderTest {
-0x80, 0x05, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
});
channel.writeInbound(in);
assertFalse(channel.writeInbound(in));
assertFalse(channel.finish());
}
@Test(expected = DecompressionException.class)
@ -55,7 +57,8 @@ public class SnappyFrameDecoderTest {
(byte) 0xff, 0x06, 0x00, 0x00, 's', 'n', 'e', 't', 't', 'y'
});
channel.writeInbound(in);
assertFalse(channel.writeInbound(in));
assertFalse(channel.finish());
}
@Test(expected = DecompressionException.class)
@ -73,7 +76,8 @@ public class SnappyFrameDecoderTest {
0x01, 0x05, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
});
channel.writeInbound(in);
assertFalse(channel.writeInbound(in));
assertFalse(channel.finish());
}
@Test(expected = DecompressionException.class)
@ -82,7 +86,8 @@ public class SnappyFrameDecoderTest {
0x00, 0x05, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
});
channel.writeInbound(in);
assertFalse(channel.writeInbound(in));
assertFalse(channel.finish());
}
@Test
@ -92,10 +97,11 @@ public class SnappyFrameDecoderTest {
-0x7f, 0x05, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
});
channel.writeInbound(in);
assertFalse(channel.writeInbound(in));
assertNull(channel.readInbound());
assertFalse(in.isReadable());
assertFalse(channel.finish());
}
@Test
@ -105,7 +111,7 @@ public class SnappyFrameDecoderTest {
0x01, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
});
channel.writeInbound(in);
assertTrue(channel.writeInbound(in));
ByteBuf expected = Unpooled.wrappedBuffer(new byte[] { 'n', 'e', 't', 't', 'y' });
ByteBuf actual = channel.readInbound();
@ -113,6 +119,7 @@ public class SnappyFrameDecoderTest {
expected.release();
actual.release();
assertFalse(channel.finish());
}
@Test
@ -125,7 +132,7 @@ public class SnappyFrameDecoderTest {
0x6e, 0x65, 0x74, 0x74, 0x79 // "netty"
});
channel.writeInbound(in);
assertTrue(channel.writeInbound(in));
ByteBuf expected = Unpooled.wrappedBuffer(new byte[] { 'n', 'e', 't', 't', 'y' });
ByteBuf actual = channel.readInbound();
@ -134,6 +141,7 @@ public class SnappyFrameDecoderTest {
expected.release();
actual.release();
assertFalse(channel.finish());
}
// The following two tests differ in only the checksum provided for the literal
@ -149,7 +157,8 @@ public class SnappyFrameDecoderTest {
0x01, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 'n', 'e', 't', 't', 'y'
});
channel.writeInbound(in);
assertFalse(channel.writeInbound(in));
assertFalse(channel.finish());
}
@Test
@ -162,6 +171,13 @@ public class SnappyFrameDecoderTest {
0x01, 0x09, 0x00, 0x00, 0x6f, -0x68, -0x7e, -0x5e, 'n', 'e', 't', 't', 'y'
});
channel.writeInbound(in);
assertTrue(channel.writeInbound(in));
ByteBuf expected = Unpooled.wrappedBuffer(new byte[] { 'n', 'e', 't', 't', 'y' });
ByteBuf actual = channel.readInbound();
assertEquals(expected, actual);
expected.release();
actual.release();
assertFalse(channel.finish());
}
}