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

release replaying decoder cumulation buffer after firing upstream

Browse Source
This commit is contained in:
Norman Maurer 2011-11-06 20:35:23 +01:00
parent 47a3783d6c
commit 1f3d35bd34
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
View File

@ -504,6 +504,11 @@ public abstract class ReplayingDecoder<T extends Enum<T>>
// A successful decode // A successful decode
unfoldAndFireMessageReceived(context, result, remoteAddress); unfoldAndFireMessageReceived(context, result, remoteAddress);
if (!cumulation.readable()) {
this.cumulation.set(null);
replayable = ReplayingDecoderBuffer.EMPTY_BUFFER;
}
} }
} }
@ -551,6 +556,7 @@ public abstract class ReplayingDecoder<T extends Enum<T>>
} catch (ReplayError replay) { } catch (ReplayError replay) {
// Ignore // Ignore
} finally { } finally {
replayable = ReplayingDecoderBuffer.EMPTY_BUFFER;
ctx.sendUpstream(e); ctx.sendUpstream(e);
} }
} }

7
src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java
View File

@ -27,6 +27,7 @@ import java.nio.charset.Charset;
import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.ChannelBufferFactory;
import org.jboss.netty.buffer.ChannelBufferIndexFinder; import org.jboss.netty.buffer.ChannelBufferIndexFinder;
import org.jboss.netty.buffer.ChannelBuffers;
/** /**
* @author <a href="http://www.jboss.org/netty/">The Netty Project</a> * @author <a href="http://www.jboss.org/netty/">The Netty Project</a>
@ -42,6 +43,12 @@ class ReplayingDecoderBuffer implements ChannelBuffer {
private final ChannelBuffer buffer; private final ChannelBuffer buffer;
private boolean terminated; private boolean terminated;
public static ReplayingDecoderBuffer EMPTY_BUFFER = new ReplayingDecoderBuffer(ChannelBuffers.EMPTY_BUFFER);
static {
EMPTY_BUFFER.terminate();
}
ReplayingDecoderBuffer(ChannelBuffer buffer) { ReplayingDecoderBuffer(ChannelBuffer buffer) {
this.buffer = buffer; this.buffer = buffer;
} }