diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferPool.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferPool.java
new file mode 100644
index 000000000..4f22bb414
--- /dev/null
+++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferPool.java
@@ -0,0 +1,26 @@
+package com.ai.cloud.skywalking.buffer;
+
+import com.ai.cloud.skywalking.protocol.common.ISerializable;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+import static com.ai.cloud.skywalking.conf.Config.Buffer.POOL_SIZE;
+
+/**
+ * Created by wusheng on 16/7/21.
+ */
+class BufferPool {
+    // 注意： 这个变量名如果改变需要改变test-api工程中的Config变量
+    private static BufferGroup[] bufferGroups = new BufferGroup[POOL_SIZE];
+    static {
+        for (int i = 0; i < POOL_SIZE; i++) {
+            bufferGroups[i] = new BufferGroup("buffer_group-" + i);
+        }
+    }
+
+    public void save(ISerializable data) {
+        bufferGroups[ThreadLocalRandom.current().nextInt(0, POOL_SIZE)].save(data);
+    }
+
+
+}
diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/ContextBuffer.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/ContextBuffer.java
index 9883a8545..402f867cf 100644
--- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/ContextBuffer.java
+++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/ContextBuffer.java
@@ -25,22 +25,6 @@ public class ContextBuffer {
     		logger.error("save span error.", t);
     	}
     }
-
-
-    static class BufferPool {
-        // 注意： 这个变量名如果改变需要改变test-api工程中的Config变量
-        private static BufferGroup[] bufferGroups = new BufferGroup[POOL_SIZE];
-        static {
-            for (int i = 0; i < POOL_SIZE; i++) {
-                bufferGroups[i] = new BufferGroup("buffer_group-" + i);
-            }
-        }
-
-        public void save(ISerializable data) {
-            bufferGroups[ThreadLocalRandom.current().nextInt(0, POOL_SIZE)].save(data);
-        }
-
-    }
 }
 
 
diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/AtomicRangeInteger.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/AtomicRangeInteger.java
index 7160acc79..d5ed69379 100644
--- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/AtomicRangeInteger.java
+++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/AtomicRangeInteger.java
@@ -19,9 +19,9 @@ public class AtomicRangeInteger extends Number implements java.io.Serializable {
 	/**
 	 * Creates a new AtomicInteger with the given initial value and max value
 	 *
-	 * @param initialValue
+	 * @param startValue
 	 *            the initial value
-	 * @param endValue
+	 * @param maxValue
 	 * 
 	 * AtomicRangeInteger在startValue和maxValue循环取值（ startValue <= value <  maxValue）
 	 */