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

Merge pull request #446 from jpinner/http_compression_error

Browse Source 
Fix for issue #444: Http compression error
This commit is contained in:
Norman Maurer 2012-07-09 22:54:07 -07:00
commit 7180146084
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/org/jboss/netty/handler/codec/compression/JdkZlibEncoder.java
View File

@ -222,42 +222,41 @@ public class JdkZlibEncoder extends OneToOneEncoder implements LifeCycleAwareCha
}
private ChannelFuture finishEncode(final ChannelHandlerContext ctx, final ChannelEvent evt) {
ChannelFuture future = Channels.succeededFuture(ctx.getChannel());
if (!finished.compareAndSet(false, true)) {
if (evt != null) {
ctx.sendDownstream(evt);
}
return Channels.succeededFuture(ctx.getChannel());
return future;
}
ChannelBuffer footer = ChannelBuffers.EMPTY_BUFFER;
ChannelBuffer footer = ChannelBuffers.dynamicBuffer(ctx.getChannel().getConfig().getBufferFactory());
synchronized (deflater) {
int numBytes = 0;
deflater.finish();
if (!deflater.finished()) {
numBytes = deflater.deflate(out, 0, out.length);
}
int footerSize = gzip ? numBytes + 8 : numBytes;
if (footerSize > 0) {
footer = ctx.getChannel().getConfig().getBufferFactory().getBuffer(footerSize);
while (!deflater.finished()) {
int numBytes = deflater.deflate(out, 0, out.length);
footer.writeBytes(out, 0, numBytes);
if (gzip) {
int crcValue = (int) crc.getValue();
int uncBytes = deflater.getTotalIn();
footer.writeByte(crcValue);
footer.writeByte(crcValue >>> 8);
footer.writeByte(crcValue >>> 16);
footer.writeByte(crcValue >>> 24);
footer.writeByte(uncBytes);
footer.writeByte(uncBytes >>> 8);
footer.writeByte(uncBytes >>> 16);
footer.writeByte(uncBytes >>> 24);
}
}
if (gzip) {
int crcValue = (int) crc.getValue();
int uncBytes = deflater.getTotalIn();
footer.writeByte(crcValue);
footer.writeByte(crcValue >>> 8);
footer.writeByte(crcValue >>> 16);
footer.writeByte(crcValue >>> 24);
footer.writeByte(uncBytes);
footer.writeByte(uncBytes >>> 8);
footer.writeByte(uncBytes >>> 16);
footer.writeByte(uncBytes >>> 24);
}
deflater.end();
}
ChannelFuture future = Channels.future(ctx.getChannel());
Channels.write(ctx, future, footer);
if (footer.readable()) {
future = Channels.future(ctx.getChannel());
Channels.write(ctx, future, footer);
}
if (evt != null) {
future.addListener(new ChannelFutureListener() {