From 59bc375f73b17d837256148060e04a6ade38e80a Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Sat, 10 Nov 2012 00:48:35 +0900 Subject: [PATCH] Fix backward incompatibility --- .../jboss/netty/handler/codec/base64/Base64Decoder.java | 4 ++-- .../jboss/netty/handler/codec/string/StringEncoder.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/jboss/netty/handler/codec/base64/Base64Decoder.java b/src/main/java/org/jboss/netty/handler/codec/base64/Base64Decoder.java index 16fa84f178..b5e019fa5f 100644 --- a/src/main/java/org/jboss/netty/handler/codec/base64/Base64Decoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/base64/Base64Decoder.java @@ -65,8 +65,8 @@ public class Base64Decoder extends OneToOneDecoder { @Override protected Object decode(ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception { - if (msg instanceof CharSequence) { - msg = ChannelBuffers.copiedBuffer((CharSequence) msg, CharsetUtil.US_ASCII); + if (msg instanceof String) { + msg = ChannelBuffers.copiedBuffer((String) msg, CharsetUtil.US_ASCII); } else if (!(msg instanceof ChannelBuffer)) { return msg; } diff --git a/src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java b/src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java index 5ce1000469..de92e34933 100644 --- a/src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java @@ -87,10 +87,11 @@ public class StringEncoder extends OneToOneEncoder { @Override protected Object encode( ChannelHandlerContext ctx, Channel channel, Object msg) throws Exception { - if (!(msg instanceof CharSequence)) { - return msg; + if (msg instanceof String) { + return copiedBuffer( + ctx.getChannel().getConfig().getBufferFactory().getDefaultOrder(), (String) msg, charset); } - return copiedBuffer( - ctx.getChannel().getConfig().getBufferFactory().getDefaultOrder(), (CharSequence) msg, charset); + + return msg; } }