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

No need to have nested try blocks

Browse Source 
.. because the catch block catches everything and rethrows it
This commit is contained in:
Trustin Lee 2013-04-04 14:44:52 +09:00
parent 788b88b7af
commit c25fd78ca0
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java
View File

@ -109,35 +109,33 @@ public abstract class ByteToMessageDecoder
OutputMessageBuf out = OutputMessageBuf.get(); OutputMessageBuf out = OutputMessageBuf.get();
try { try {
while (in.isReadable()) { while (in.isReadable()) {
try { int outSize = out.size();
int outSize = out.size(); int oldInputLength = in.readableBytes();
int oldInputLength = in.readableBytes(); decode(ctx, in, out);
decode(ctx, in, out); if (outSize == out.size()) {
if (outSize == out.size()) { wasNull = true;
wasNull = true;
if (oldInputLength == in.readableBytes()) {
break;
} else {
continue;
}
}
wasNull = false;
if (oldInputLength == in.readableBytes()) { if (oldInputLength == in.readableBytes()) {
throw new IllegalStateException(
"decode() did not read anything but decoded a message.");
}
if (isSingleDecode()) {
break; break;
}
} catch (Throwable t) {
if (t instanceof CodecException) {
throw (CodecException) t;
} else { } else {
throw new DecoderException(t); continue;
} }
} }
wasNull = false;
if (oldInputLength == in.readableBytes()) {
throw new IllegalStateException(
"decode() did not read anything but decoded a message.");
}
if (isSingleDecode()) {
break;
}
}
} catch (Throwable t) {
if (t instanceof CodecException) {
throw (CodecException) t;
} else {
throw new DecoderException(t);
} }
} finally { } finally {
if (out.drainToNextInbound(ctx)) { if (out.drainToNextInbound(ctx)) {