Merge "Fixed publishDataChangeEvent in 2phase commit"

[controller.git] / opendaylight / netconf / netconf-util / src / main / java / org / opendaylight / controller / netconf / util / handler / NetconfMessageChunkDecoder.java

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 b713fcd7e3e5c5224fb9f481db83edda9721e661..39182263b6cd9e0c1067d347ad5839efb06281bf 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
@@ -11,7 +11,7 @@ package org.opendaylight.controller.netconf.util.handler;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import org.opendaylight.controller.netconf.util.messages.NetconfMessageHeader;
+import org.opendaylight.controller.netconf.util.messages.NetconfMessageConstants;
 import org.opendaylight.protocol.framework.DeserializerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,13 +38,12 @@ public class NetconfMessageChunkDecoder extends ByteToMessageDecoder {
                 }
                 if (chunkSize != -1 && isParsed) {
                     in.readBytes(byteBufMsg, chunkSize);
-                    logger.debug("Chunked data of size {} read.", chunkSize);
                     isParsed = false;
                 } else {
                     throw new DeserializerException("Unable to parse chunked data or header.");
                 }
             } catch (Exception e) {
-                logger.debug("Failed to decode chunked message.", e);
+                logger.error("Failed to decode chunked message.", e);
                 this.exceptionCaught(ctx, e);
             }
         }
@@ -53,8 +52,8 @@ public class NetconfMessageChunkDecoder extends ByteToMessageDecoder {
     }
 
     private int readHeader(ByteBuf in) {
-        ByteBuf chunkSize = Unpooled.buffer(NetconfMessageHeader.MIN_HEADER_LENGTH,
-                NetconfMessageHeader.MAX_HEADER_LENGTH);
+        ByteBuf chunkSize = Unpooled.buffer(NetconfMessageConstants.MIN_HEADER_LENGTH,
+                NetconfMessageConstants.MAX_HEADER_LENGTH);
         byte b = in.readByte();
         if (b != 10)
             return -1;