From 8e27532579797bb98cedde83d7f93415193fab59 Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Tue, 26 Jan 2016 18:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skywalking/reciever/CollectionServer.java |  2 +-
 .../handler/CollectionServerDataHandler.java  | 21 +------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/CollectionServer.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/CollectionServer.java
index 436ee2b75..535da096c 100644
--- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/CollectionServer.java
+++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/CollectionServer.java
@@ -43,7 +43,7 @@ public class CollectionServer {
                         @Override
                         public void initChannel(io.netty.channel.socket.SocketChannel ch) throws Exception {
                             ChannelPipeline p = ch.pipeline();
-                            p.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE, 0, 4, 0, 0));
+                            p.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE, 0, 4, 0,4));
                             p.addLast("frameEncoder", new LengthFieldPrepender(4));
                             p.addLast("decoder", new ByteArrayDecoder());
                             p.addLast("encoder", new ByteArrayEncoder());
diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/handler/CollectionServerDataHandler.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/handler/CollectionServerDataHandler.java
index cca00fba6..e660fdf39 100644
--- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/handler/CollectionServerDataHandler.java
+++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/handler/CollectionServerDataHandler.java
@@ -12,26 +12,7 @@ public class CollectionServerDataHandler extends SimpleChannelInboundHandler<byt
         Thread.currentThread().setName("ServerReceiver");
         // 当接受到这条消息的是空，则忽略
         if (msg != null && msg.length >= 0 && msg.length < Config.DataPackage.MAX_DATA_PACKAGE) {
-            int start = 0;
-            int end;
-            while (start < msg.length) {
-                int length = bytesToInt(msg, start);
-                start = start + 4;
-                end = start + length;
-                byte[] dest = new byte[length];
-                System.arraycopy(msg, start, dest, 0, length);
-                DataBufferThreadContainer.getDataBufferThread().saveTemporarily(dest);
-                start = end;
-            }
+            DataBufferThreadContainer.getDataBufferThread().saveTemporarily(msg);
         }
     }
-
-    public static int bytesToInt(byte[] ary, int offset) {
-        int value;
-        value = (int) ((ary[offset + 3] & 0xFF)
-                | ((ary[offset + 2] << 8) & 0xFF00)
-                | ((ary[offset + 1] << 16) & 0xFF0000)
-                | ((ary[offset] << 24) & 0xFF000000));
-        return value;
-    }
 }