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

ReplayingDecoder should not throw an IllegalStateException even if a decoder implementation returns null when state transition occurred at least.

Browse Source
This commit is contained in:
Trustin Lee 2009-02-15 12:47:12 +00:00
parent 7860e999a7
commit 4f391f5bbc
1 changed files with 3 additions and 3 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

@ -371,11 +371,11 @@ public abstract class ReplayingDecoder<T extends Enum<T>>
try { try {
result = decode(context, channel, replayable, state); result = decode(context, channel, replayable, state);
if (result == null) { if (result == null) {
if (oldReaderIndex == cumulation.readerIndex()) { if (oldReaderIndex == cumulation.readerIndex() && oldState == state) {
throw new IllegalStateException( throw new IllegalStateException(
"null cannot be returned if no data is consumed."); "null cannot be returned if no data is consumed and state didn't change.");
} else { } else {
// Previous data has been discarded. // Previous data has been discarded or caused state transition.
// Probably it is reading on. // Probably it is reading on.
continue; continue;
} }