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

Fix buffer leak in test which was introduced while implement ZLIB_OR_NONE support. Related to [#2269]

Browse Source
This commit is contained in:
Norman Maurer 2014-03-10 06:24:53 +01:00
parent f62012cba5
commit 99995876dc
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
codec/src/test/java/io/netty/handler/codec/compression/ZlibTest.java
View File

@ -58,8 +58,7 @@ public abstract class ZlibTest {
deflatedData.release();
buf.release();
} finally {
// close channel to prevent any leak even on exception
chDecoderGZip.close();
dispose(chDecoderGZip);
}
}
@ -111,9 +110,8 @@ public abstract class ZlibTest {
data.release();
} finally {
// close channels in all cases to guard against leak when exception was thrown
chEncoder.close();
chDecoderZlib.close();
dispose(chEncoder);
dispose(chDecoderZlib);
}
}
@ -148,12 +146,29 @@ public abstract class ZlibTest {
assertFalse(chDecoderZlib.finish());
} finally {
// close channels in all cases to guard against leak when exception was thrown
chEncoder.close();
chDecoderZlib.close();
dispose(chEncoder);
dispose(chDecoderZlib);
}
}
private static void dispose(EmbeddedChannel ch) {
if (ch.finish()) {
for (;;) {
Object msg = ch.readInbound();
if (msg == null) {
break;
}
ReferenceCountUtil.release(msg);
}
for (;;) {
Object msg = ch.readOutbound();
if (msg == null) {
break;
}
ReferenceCountUtil.release(msg);
}
}
}
private void testCompressSmall(ZlibWrapper encoderWrapper, ZlibWrapper decoderWrapper) throws Exception {
testCompress0(encoderWrapper, decoderWrapper, Unpooled.wrappedBuffer(BYTES_SMALL));
testCompress0(encoderWrapper, decoderWrapper,