Changeset 533:d7f2025ab6a0

Timestamp:

11/14/11 11:46:13 (3 months ago)

Author:

xeraph

Branch:

default

Message:

fixed rpc decoder (parse bug when remaining size > 0)

File:

• kraken-rpc/src/main/java/org/krakenapps/rpc/impl/RpcDecoder.java (modified) (4 diffs)

kraken-rpc/src/main/java/org/krakenapps/rpc/impl/RpcDecoder.java

@@ -29 +29 @@
                         logger.debug("kraken-rpc: current readable length {}", buf.readableBytes());
 
+                buf.markReaderIndex();
                 if (buf.readableBytes() < 2)
                         return null;
 
+                // read type byte
                 buf.readByte();
+
+                // read length bytes
+                int lengthBytes = 0;
                 byte b = 0;
                 boolean eon = false;
@@ -40 +45 @@
 
                         b = buf.readByte();
+                        lengthBytes++;
+
                         if ((b & 0x80) != 0x80) {
                                 eon = true;
@@ -52 +59 @@
 
                 buf.resetReaderIndex();
+
+                // read type byte
                 buf.readByte();
+
+                // byte buffer read does not modify readable index
                 long length = EncodingRule.decodeRawNumber(buf.toByteBuffer());
 
-                if (buf.readableBytes() > length) {
+                if (buf.readableBytes() >= lengthBytes + length) {
                         buf.resetReaderIndex();
-                        int numLength = EncodingRule.lengthOfRawNumber(int.class, length);
-                        ByteBuffer bb = ByteBuffer.allocate((int) length + numLength + 1);
+                        ByteBuffer bb = ByteBuffer.allocate((int) length + lengthBytes + 1);
                         buf.readBytes(bb);
                         bb.flip();
@@ -65 +75 @@
                         if (logger.isDebugEnabled())
                                 logger.debug("kraken-rpc: decoded one message, remaining {}", buf.readableBytes());
-                        
-                        buf.markReaderIndex();
+
                         return decoded;
                 }