From 05738419233fc84ddf87875a6b6ee81fe1904390 Mon Sep 17 00:00:00 2001
From: zhangxin10 <curtain.xin@gmail.com>
Date: Wed, 23 Dec 2015 08:03:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82Dubbo?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=B2=A1=E6=9C=89=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BD=86Dubbo=E7=9A=84?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E7=9A=84=E6=9C=89=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82=E5=BA=94=E5=88=A4=E6=96=AD=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E6=9C=89=E6=B2=A1=E6=9C=89=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=A6=81=E6=98=AF=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=EF=BC=8C=E5=88=99=E5=B0=86=E6=9C=8D=E5=8A=A1=E7=AB=AF=E7=9A=84?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E7=BB=99=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ai/cloud/dao/impl/BuriedPointSDAO.java   | 3 +++
 skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/skywalking-webui/src/main/java/com/ai/cloud/dao/impl/BuriedPointSDAO.java b/skywalking-webui/src/main/java/com/ai/cloud/dao/impl/BuriedPointSDAO.java
index 3a64ba6ca..5b1f0735f 100644
--- a/skywalking-webui/src/main/java/com/ai/cloud/dao/impl/BuriedPointSDAO.java
+++ b/skywalking-webui/src/main/java/com/ai/cloud/dao/impl/BuriedPointSDAO.java
@@ -97,6 +97,9 @@ public class BuriedPointSDAO implements IBuriedPointSDAO {
 						clientLog.setViewPointId(serverLog.getViewPointId());
 						clientLog.setViewPointIdSub(serverLog.getViewPointIdSub());
 						clientLog.setAddress(serverLog.getAddress());
+						if (StringUtil.isBlank(clientLog.getExceptionStack())){
+							clientLog.setExceptionStack(serverLog.getExceptionStack());
+						}
 					}
 					logVO.addTimeLine(rpcVO.getValue().getStartDate(), rpcVO.getValue().getCost());
 				}
diff --git a/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl b/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl
index 14241ba48..45ccdb8b3 100644
--- a/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl
+++ b/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl
@@ -264,7 +264,7 @@
                                         <li class="list-group-item"><strong>主机信息：</strong>${logInfo.address!}</li>
                                         <li class="list-group-item"><strong>调用进程号：</strong>${logInfo.processNo!}</li>
                                         <li class="list-group-item"><strong>异常堆栈：</strong>
-                                            <#if logInfo.statusCode == 0>
+                                            <#if (logInfo.exceptionStack!)?length == 0>
                                                 无
                                             <#else>
                                             ${logInfo.exceptionStack}