From 6229fd3516080ea0bee3a10ae225e44440be9d24 Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Thu, 21 Apr 2016 18:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=89=8D=E5=8F=B0=E6=8A=A5=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/webapp/bower_components/skywalking/js/tracelog.js  | 6 ++++++
 skywalking-webui/src/main/webapp/pages/main.ftl             | 1 +
 2 files changed, 7 insertions(+)

diff --git a/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js b/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js
index 29dd40e93..59757ec0b 100644
--- a/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js
+++ b/skywalking-webui/src/main/webapp/bower_components/skywalking/js/tracelog.js
@@ -1,4 +1,5 @@
 function changeData(data) {
+
     var result = {
         traceTree: {
             traceId: "",
@@ -9,6 +10,11 @@ function changeData(data) {
             treeNodes: []
         }
     };
+
+    if (data.nodes == undefined || data.nodes.length  == 0){
+        return result;
+    }
+
     result.traceTree.traceId = data.traceId;
     result.traceTree.totalTime = data.endTime - data.beginTime;
     var totalTime = result.traceTree.totalTime;
diff --git a/skywalking-webui/src/main/webapp/pages/main.ftl b/skywalking-webui/src/main/webapp/pages/main.ftl
index 569454399..8fabbbbbf 100644
--- a/skywalking-webui/src/main/webapp/pages/main.ftl
+++ b/skywalking-webui/src/main/webapp/pages/main.ftl
@@ -63,6 +63,7 @@
 
         if (loadType == "showTraceInfo"){
             loadTraceTreeData("${_base}");
+            return;
         }
 
         if (loadType == "showAnlyResult"){