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

Fixed issue: NETTY-142 ReplayingDecoder calls decodeLast with unreplayable buffer

Browse Source 
* decodeLast is now provided with replayable instead of cumulative
* Renamed fireMessageReceived to unfoldAndFireMessageReceived to avoid confusion
This commit is contained in:
Trustin Lee 2009-04-08 07:23:24 +00:00
parent c55c25291a
commit d0ee16781a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,11 +407,12 @@ public abstract class ReplayingDecoder<T extends Enum<T>>
}
// A successful decode
fireMessageReceived(context, remoteAddress, result);
unfoldAndfireMessageReceived(context, result, remoteAddress);
}
}
private void fireMessageReceived(ChannelHandlerContext context, SocketAddress remoteAddress, Object result) {
private void unfoldAndfireMessageReceived(
ChannelHandlerContext context, Object result, SocketAddress remoteAddress) {
if (unfold) {
if (result instanceof Object[]) {
for (Object r: (Object[]) result) {
@ -443,9 +444,9 @@ public abstract class ReplayingDecoder<T extends Enum<T>>
callDecode(ctx, e.getChannel(), cumulation, null);
if (cumulation.readable()) {
// and send the remainders too if necessary.
Object partiallyDecoded = decodeLast(ctx, e.getChannel(), cumulation, state);
Object partiallyDecoded = decodeLast(ctx, e.getChannel(), replayable, state);
if (partiallyDecoded != null) {
fireMessageReceived(ctx, null, partiallyDecoded);
unfoldAndfireMessageReceived(ctx, partiallyDecoded, null);
}
}
}