Author: trustin
Date: Thu Sep 13 02:23:37 2007
New Revision: 575234
URL: http://svn.apache.org/viewvc?rev=575234&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/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
Modified:
mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
URL:
http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java?rev=575234&r1=575233&r2=575234&view=diff
==============================================================================
---
mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
(original)
+++
mina/branches/1.1/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
Thu Sep 13 02:23:37 2007
@@ -294,9 +294,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);