You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2011/10/25 17:02:40 UTC
svn commit: r1188690 -
/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
Author: elecharny
Date: Tue Oct 25 15:02:39 2011
New Revision: 1188690
URL: http://svn.apache.org/viewvc?rev=1188690&view=rev
Log:
Some cleanup
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java?rev=1188690&r1=1188689&r2=1188690&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java Tue Oct 25 15:02:39 2011
@@ -76,6 +76,7 @@ public class ProtocolCodecFilter impleme
if (encoder == null) {
throw new IllegalArgumentException("encoder");
}
+
if (decoder == null) {
throw new IllegalArgumentException("decoder");
}
@@ -106,20 +107,25 @@ public class ProtocolCodecFilter impleme
if (encoderClass == null) {
throw new IllegalArgumentException("encoderClass");
}
+
if (decoderClass == null) {
throw new IllegalArgumentException("decoderClass");
}
+
if (!ProtocolEncoder.class.isAssignableFrom(encoderClass)) {
throw new IllegalArgumentException("encoderClass: " + encoderClass.getName());
}
+
if (!ProtocolDecoder.class.isAssignableFrom(decoderClass)) {
throw new IllegalArgumentException("decoderClass: " + decoderClass.getName());
}
+
try {
encoderClass.getConstructor(EMPTY_PARAMS);
} catch (NoSuchMethodException e) {
throw new IllegalArgumentException("encoderClass doesn't have a public default constructor.");
}
+
try {
decoderClass.getConstructor(EMPTY_PARAMS);
} catch (NoSuchMethodException e) {
@@ -161,7 +167,7 @@ public class ProtocolCodecFilter impleme
* @return The encoder instance, if any
*/
public ProtocolEncoder getEncoder(IoSession session) {
- return (ProtocolEncoder) session.getAttribute(ENCODER);
+ return factory.getEncoder(session);
}
/**
@@ -171,7 +177,7 @@ public class ProtocolCodecFilter impleme
* @return The decoder instance, if any
*/
public ProtocolDecoder getDecoder(IoSession session) {
- return (ProtocolDecoder) session.getAttribute(DECODER);
+ return factory.getDecoder(session);
}
/**