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

Fixed issue: NETTY-260 ZlibEncoder.close() and SslHandler.handshake/close() methods do not require a parameter

Browse Source 
* ZlibEncoder implements LifeCycleAwareChannelHandler to retrieve its context
* ZlibEncoder.close() does not need an argument anymore
This commit is contained in:
Trustin Lee 2009-12-17 08:37:11 +00:00
parent 2958023950
commit 3275f74ef9
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
View File

@ -27,6 +27,7 @@ import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipelineCoverage; import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelStateEvent; import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.Channels; import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.LifeCycleAwareChannelHandler;
import org.jboss.netty.handler.codec.oneone.OneToOneEncoder; import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
import org.jboss.netty.util.internal.jzlib.JZlib; import org.jboss.netty.util.internal.jzlib.JZlib;
import org.jboss.netty.util.internal.jzlib.ZStream; import org.jboss.netty.util.internal.jzlib.ZStream;
@ -40,12 +41,13 @@ import org.jboss.netty.util.internal.jzlib.ZStream;
* @version $Rev$, $Date$ * @version $Rev$, $Date$
*/ */
@ChannelPipelineCoverage("one") @ChannelPipelineCoverage("one")
public class ZlibEncoder extends OneToOneEncoder { public class ZlibEncoder extends OneToOneEncoder implements LifeCycleAwareChannelHandler {
private static final byte[] EMPTY_ARRAY = new byte[0]; private static final byte[] EMPTY_ARRAY = new byte[0];
private final ZStream z = new ZStream(); private final ZStream z = new ZStream();
private final AtomicBoolean finished = new AtomicBoolean(); private final AtomicBoolean finished = new AtomicBoolean();
private volatile ChannelHandlerContext ctx;
/** /**
* Creates a new zlib encoder with the default compression level ({@code 6}) * Creates a new zlib encoder with the default compression level ({@code 6})
@ -161,8 +163,12 @@ public class ZlibEncoder extends OneToOneEncoder {
} }
} }
public ChannelFuture close(Channel channel) { public ChannelFuture close() {
return finishEncode(channel.getPipeline().getContext(this), null); ChannelHandlerContext ctx = this.ctx;
if (ctx == null) {
throw new IllegalStateException("not added to a pipeline");
}
return finishEncode(ctx, null);
} }
public boolean isClosed() { public boolean isClosed() {
@ -304,4 +310,20 @@ public class ZlibEncoder extends OneToOneEncoder {
return future; return future;
} }
public void beforeAdd(ChannelHandlerContext ctx) throws Exception {
this.ctx = ctx;
}
public void afterAdd(ChannelHandlerContext ctx) throws Exception {
// Unused
}
public void beforeRemove(ChannelHandlerContext ctx) throws Exception {
// Unused
}
public void afterRemove(ChannelHandlerContext ctx) throws Exception {
// Unused
}
} }