From 7f749c1dd0a127b5f98e5ac2b061693407cadbbb Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Fri, 13 Nov 2015 22:40:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=90=8D=E5=92=8C=E4=BB=A3=E7=A0=81=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=202.=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reciever/buffer/DataBufferThread.java     | 20 +++++++++++--------
 .../reciever/constants/ServerConstants.java   |  4 ----
 2 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/constants/ServerConstants.java

diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java
index 9b0a25f46..9811d3090 100644
--- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java
+++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java
@@ -45,13 +45,12 @@ public class DataBufferThread extends Thread {
         boolean isWriteFailure;
         int index = 0;
         while (true) {
-            boolean bool = false;
-            int count = 0;
-            for (int i = 0; i < data.length; i++, count++) {
+            boolean hasData2Flush = false;
+            for (int i = 0; i < data.length; i++) {
                 if (data[i] == null) {
                     continue;
                 }
-                bool = true;
+                hasData2Flush = true;
                 isWriteFailure = true;
                 while (isWriteFailure) {
                     try {
@@ -80,7 +79,7 @@ public class DataBufferThread extends Thread {
 
             }
 
-            if (bool){
+            if (hasData2Flush){
                 try {
                     outputStream.flush();
                 } catch (IOException e) {
@@ -92,7 +91,7 @@ public class DataBufferThread extends Thread {
                 convertFile();
             }
 
-            if (!bool) {
+            if (!hasData2Flush) {
                 try {
                     Thread.sleep(MAX_WAIT_TIME);
                 } catch (InterruptedException e) {
@@ -113,9 +112,14 @@ public class DataBufferThread extends Thread {
         try {
             outputStream.write("EOF\n".getBytes());
             outputStream.flush();
-            outputStream.close();
         } catch (IOException e) {
-            logger.error("Write cache data failed.", e);
+            logger.error("Write eof to cache data file.", e);
+        } finally{
+        	try {
+        		outputStream.close();
+        	} catch (IOException e) {
+        		logger.error("close cache data failed.", e);
+        	}
         }
         logger.debug("Begin to switch the data file to {}.", fileName);
         try {
diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/constants/ServerConstants.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/constants/ServerConstants.java
deleted file mode 100644
index 26630292d..000000000
--- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/constants/ServerConstants.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.ai.cloud.skywalking.reciever.constants;
-
-public class ServerConstants {
-}