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

* Proper handling of Z_STREAM_END result code in ZlibDecoder

Browse Source 
* Added ZlibDecoder.isClosed()
This commit is contained in:
Trustin Lee 2009-10-21 03:53:19 +00:00
parent b646071570
commit 5cfaf7333c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java
View File

@ -37,6 +37,7 @@ import com.jcraft.jzlib.ZStreamException;
public class ZlibDecoder extends OneToOneDecoder { public class ZlibDecoder extends OneToOneDecoder {
private final ZStream z = new ZStream(); private final ZStream z = new ZStream();
private volatile boolean finished;
// TODO Auto-detect wrappers (zlib, gzip, nowrapper as a fallback) // TODO Auto-detect wrappers (zlib, gzip, nowrapper as a fallback)
@ -74,9 +75,17 @@ public class ZlibDecoder extends OneToOneDecoder {
} }
} }
/**
* Returns {@code true} if and only if the end of the compressed stream
* has been reached.
*/
public boolean isClosed() {
return finished;
}
@Override @Override
protected Object decode(ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception { protected Object decode(ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception {
if (!(msg instanceof ChannelBuffer)) { if (!(msg instanceof ChannelBuffer) || finished) {
return msg; return msg;
} }
@ -103,7 +112,7 @@ public class ZlibDecoder extends OneToOneDecoder {
int resultCode = z.inflate(JZlib.Z_SYNC_FLUSH); int resultCode = z.inflate(JZlib.Z_SYNC_FLUSH);
switch (resultCode) { switch (resultCode) {
case JZlib.Z_STREAM_END: case JZlib.Z_STREAM_END:
// TODO: Remove myself from the pipeline finished = true; // Do not decode anymore.
case JZlib.Z_OK: case JZlib.Z_OK:
case JZlib.Z_BUF_ERROR: case JZlib.Z_BUF_ERROR:
decompressed.writeBytes(out, 0, z.next_out_index); decompressed.writeBytes(out, 0, z.next_out_index);