X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fnetconf-netty-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fnettyutil%2Fhandler%2FNetconfChunkAggregator.java;h=74bf492292b4c16d0e29d8aa14637d687f82511a;hb=eaace15120044a3e602fd3093b2412be03fd2133;hp=144b4f5b4c22187b71004a7e1ade5a5bce9b1cab;hpb=7aa14fc90d0344b9645c5c6ddd64315a1c2dc748;p=netconf.git

diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java
index 144b4f5b4c..74bf492292 100644
--- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java
+++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java
@@ -21,6 +21,8 @@ public class NetconfChunkAggregator extends ByteToMessageDecoder {
     private static final Logger LOG = LoggerFactory.getLogger(NetconfChunkAggregator.class);
     private static final String GOT_PARAM_WHILE_WAITING_FOR_PARAM = "Got byte {} while waiting for {}";
     private static final String GOT_PARAM_WHILE_WAITING_FOR_PARAM_PARAM = "Got byte {} while waiting for {}-{}";
+    private static final String GOT_PARAM_WHILE_WAITING_FOR_PARAM_PARAM_PARAM =
+        "Got byte {} while waiting for {}-{}-{}";
     public static final int DEFAULT_MAXIMUM_CHUNK_SIZE = 16 * 1024 * 1024;
 
     private enum State {
@@ -66,30 +68,26 @@ public class NetconfChunkAggregator extends ByteToMessageDecoder {
                           final ByteBuf in, final List<Object> out) throws IllegalStateException {
         while (in.isReadable()) {
             switch (state) {
-                case HEADER_ONE:
-                {
+                case HEADER_ONE: {
                     final byte b = in.readByte();
                     checkNewLine(b, "Malformed chunk header encountered (byte 0)");
                     state = State.HEADER_TWO;
                     initChunk();
                     break;
                 }
-                case HEADER_TWO:
-                {
+                case HEADER_TWO: {
                     final byte b = in.readByte();
                     checkHash(b, "Malformed chunk header encountered (byte 1)");
                     state = State.HEADER_LENGTH_FIRST;
                     break;
                 }
-                case HEADER_LENGTH_FIRST:
-                {
+                case HEADER_LENGTH_FIRST: {
                     final byte b = in.readByte();
                     chunkSize = processHeaderLengthFirst(b);
                     state = State.HEADER_LENGTH_OTHER;
                     break;
                 }
-                case HEADER_LENGTH_OTHER:
-                {
+                case HEADER_LENGTH_OTHER: {
                     final byte b = in.readByte();
                     if (b == '\n') {
                         state = State.DATA;
@@ -119,31 +117,27 @@ public class NetconfChunkAggregator extends ByteToMessageDecoder {
                     aggregateChunks(in.readBytes((int) chunkSize));
                     state = State.FOOTER_ONE;
                     break;
-                case FOOTER_ONE:
-                {
+                case FOOTER_ONE: {
                     final byte b = in.readByte();
                     checkNewLine(b,"Malformed chunk footer encountered (byte 0)");
                     state = State.FOOTER_TWO;
                     chunkSize = 0;
                     break;
                 }
-                case FOOTER_TWO:
-                {
+                case FOOTER_TWO: {
                     final byte b = in.readByte();
                     checkHash(b,"Malformed chunk footer encountered (byte 1)");
                     state = State.FOOTER_THREE;
                     break;
                 }
-                case FOOTER_THREE:
-                {
+                case FOOTER_THREE: {
                     final byte b = in.readByte();
                     // In this state, either header-of-new-chunk or message-end is expected
                     // Depends on the next character
                     extractNewChunkOrMessageEnd(b);
                     break;
                 }
-                case FOOTER_FOUR:
-                {
+                case FOOTER_FOUR: {
                     final byte b = in.readByte();
                     checkNewLine(b,"Malformed chunk footer encountered (byte 3)");
                     state = State.HEADER_ONE;
@@ -151,10 +145,8 @@ public class NetconfChunkAggregator extends ByteToMessageDecoder {
                     chunk = null;
                     break;
                 }
-                default :
-                {
+                default:
                     LOG.info("Unknown state.");
-                }
             }
         }
 
@@ -170,7 +162,7 @@ public class NetconfChunkAggregator extends ByteToMessageDecoder {
         } else if (byteToCheck == '#') {
             state = State.FOOTER_FOUR;
         } else {
-            LOG.debug(GOT_PARAM_WHILE_WAITING_FOR_PARAM_PARAM, byteToCheck, (byte) '#', (byte) '1', (byte) '9');
+            LOG.debug(GOT_PARAM_WHILE_WAITING_FOR_PARAM_PARAM_PARAM, byteToCheck, (byte) '#', (byte) '1', (byte) '9');
             throw new IllegalStateException("Malformed chunk footer encountered (byte 2)");
         }
     }