From 1b6e6e95d70e8ba5fd8d695d73b97c004299d21f Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Mon, 18 Jan 2016 10:56:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96spanEntry.setSpan=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/mapper/CallChainMapper.java           | 14 ++------------
 .../cloud/skywalking/analysis/model/SpanEntry.java | 14 +++++++-------
 .../analysis/mapper/CallChainMapperTest.java       | 14 ++------------
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapper.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapper.java
index 48a3285ee..c9fca6601 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapper.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapper.java
@@ -101,21 +101,11 @@ public class CallChainMapper extends TableMapper<Text, ChainInfo> {
         Map<String, SpanEntry> spanEntryMap = new HashMap<String, SpanEntry>();
         for (Span span : spanList) {
             SpanEntry spanEntry = spanEntryMap.get(span.getParentLevel() + "." + span.getLevelId());
-            if (spanEntry != null && span.isReceiver()) {
-                if (span.isReceiver()) {
-                    spanEntry.setServerSpan(span);
-                } else {
-                    spanEntry.setClientSpan(span);
-                }
-            } else {
+            if (spanEntry == null) {
                 spanEntry = new SpanEntry();
-                if (span.isReceiver()) {
-                    spanEntry.setServerSpan(span);
-                } else {
-                    spanEntry.setClientSpan(span);
-                }
                 spanEntryMap.put(span.getParentLevel() + "." + span.getLevelId(), spanEntry);
             }
+            spanEntry.setSpan(span);
         }
         return spanEntryMap;
     }
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/model/SpanEntry.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/model/SpanEntry.java
index ea40cbafd..b9e645dec 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/model/SpanEntry.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/model/SpanEntry.java
@@ -132,13 +132,13 @@ public class SpanEntry {
     public Span getServerSpan() {
         return serverSpan;
     }
-
-    public void setClientSpan(Span clientSpan) {
-        this.clientSpan = clientSpan;
-    }
-
-    public void setServerSpan(Span serverSpan) {
-        this.serverSpan = serverSpan;
+    
+    public void setSpan(Span span){
+    	if (span.isReceiver()) {
+    		this.serverSpan = span;
+    	}else{
+    		this.clientSpan = span;
+    	}
     }
 
     public String getSpanType() {
diff --git a/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java b/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java
index f9b190ce7..4a8515b6a 100644
--- a/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java
+++ b/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java
@@ -108,21 +108,11 @@ public class CallChainMapperTest {
         Map<String, SpanEntry> spanEntryMap = new HashMap<String, SpanEntry>();
         for (Span span : spanList) {
             SpanEntry spanEntry = spanEntryMap.get(span.getParentLevel() + "." + span.getLevelId());
-            if (spanEntry != null && span.isReceiver()) {
-                if (span.isReceiver()) {
-                    spanEntry.setServerSpan(span);
-                } else {
-                    spanEntry.setClientSpan(span);
-                }
-            } else {
+            if (spanEntry == null) {
                 spanEntry = new SpanEntry();
-                if (span.isReceiver()) {
-                    spanEntry.setServerSpan(span);
-                } else {
-                    spanEntry.setClientSpan(span);
-                }
                 spanEntryMap.put(span.getParentLevel() + "." + span.getLevelId(), spanEntry);
             }
+            spanEntry.setSpan(span);
         }
         return spanEntryMap;
     }