Merge "Correct encoding"

diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfMessageChunkDecoder.java b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfMessageChunkDecoder.java
index 5c00b9b7153818082cd3b2303efec085e6619f30..77ef3861d2325d0e478ec058259487dfe5d9c756 100644 (file)
--- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfMessageChunkDecoder.java
+++ b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/handler/NetconfMessageChunkDecoder.java
@@ -13,7 +13,6 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
 
-import java.nio.charset.Charset;
 import java.util.List;
 
 import org.opendaylight.controller.netconf.api.NetconfDeserializerException;
@@ -21,8 +20,9 @@ import org.opendaylight.controller.netconf.util.messages.NetconfMessageConstants
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NetconfMessageChunkDecoder extends ByteToMessageDecoder {
+import com.google.common.base.Charsets;
 
+public class NetconfMessageChunkDecoder extends ByteToMessageDecoder {
     private final static Logger logger = LoggerFactory.getLogger(NetconfMessageChunkDecoder.class);
 
     @Override
@@ -63,7 +63,7 @@ public class NetconfMessageChunkDecoder extends ByteToMessageDecoder {
         while ((b = in.readByte()) != 10) {
             chunkSize.writeByte(b);
         }
-        return Integer.parseInt(chunkSize.toString(Charset.forName("UTF-8")));
+        return Integer.parseInt(chunkSize.toString(Charsets.US_ASCII));
     }
 
 }