You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@mina.apache.org by tr...@apache.org on 2007/09/13 11:23:42 UTC

svn commit: r575235 - /mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java

Author: trustin
Date: Thu Sep 13 02:23:41 2007
New Revision: 575235

URL: http://svn.apache.org/viewvc?rev=575235&view=rev
Log:
Fixed issue: DIRMINA-436 (DemuxingProtocolCodecFactory doesn't reset the current MessageDecoder when NOT_OK is returned.)
* Reset currentDecoder to null when NOT_OK or wrong value is returned from the current MessageDecoder implementation.

Modified:
    mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java

Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java?rev=575235&r1=575234&r2=575235&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java Thu Sep 13 02:23:41 2007
@@ -298,9 +298,11 @@
             } else if (result == MessageDecoder.NEED_DATA) {
                 return false;
             } else if (result == MessageDecoder.NOT_OK) {
+                currentDecoder = null;
                 throw new ProtocolDecoderException(
                         "Message decoder returned NOT_OK.");
             } else {
+                currentDecoder = null;
                 throw new IllegalStateException(
                         "Unexpected decode result (see your decode()): "
                                 + result);