From 82976d860fa18ac35d3027003149c6bb59f764eb Mon Sep 17 00:00:00 2001
From: Jaehong Kim <jaehong.kim@navercorp.com>
Date: Tue, 24 Mar 2015 18:13:17 +0900
Subject: [PATCH 1/2] fix spen event annotation setup

---
 .../navercorp/pinpoint/common/bo/SpanEventBo.java   | 13 ++++++++++---
 .../pinpoint/web/service/SpanServiceImpl.java       |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/bo/SpanEventBo.java b/commons/src/main/java/com/navercorp/pinpoint/common/bo/SpanEventBo.java
index 897648385..20e579df8 100644
--- a/commons/src/main/java/com/navercorp/pinpoint/common/bo/SpanEventBo.java
+++ b/commons/src/main/java/com/navercorp/pinpoint/common/bo/SpanEventBo.java
@@ -116,7 +116,7 @@ public class SpanEventBo implements Span {
             this.nextSpanId = tSpanEvent.getNextSpanId();
         }
         
-        setAnnotationBoList(tSpanEvent.getAnnotations());
+        setAnnotationList(tSpanEvent.getAnnotations());
 
         final TIntStringValue exceptionInfo = tSpanEvent.getExceptionInfo();
         if (exceptionInfo != null) {
@@ -168,7 +168,7 @@ public class SpanEventBo implements Span {
             this.nextSpanId = spanEvent.getNextSpanId();
         }
 
-        setAnnotationBoList(spanEvent.getAnnotations());
+        setAnnotationList(spanEvent.getAnnotations());
 
         final TIntStringValue exceptionInfo = spanEvent.getExceptionInfo();
         if (exceptionInfo != null) {
@@ -321,7 +321,7 @@ public class SpanEventBo implements Span {
         this.nextSpanId = nextSpanId;
     }
 
-    private void setAnnotationBoList(List<TAnnotation> annotations) {
+    private void setAnnotationList(List<TAnnotation> annotations) {
         if (annotations == null) {
             return;
         }
@@ -332,6 +332,13 @@ public class SpanEventBo implements Span {
         this.annotationBoList = boList;
     }
 
+    public void setAnnotationBoList(List<AnnotationBo> anoList) {
+        if (anoList == null) {
+            return;
+        }
+        this.annotationBoList = anoList;
+    }
+    
     public boolean hasException() {
         return hasException;
     }
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java b/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java
index f75f1747c..3f687e3fd 100644
--- a/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java
+++ b/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java
@@ -99,7 +99,7 @@ public class SpanServiceImpl implements SpanService {
                 annotationBoList = spanAlign.getSpanEventBo().getAnnotationBoList();
                 if (annotationBoList == null) {
                     annotationBoList = new ArrayList<AnnotationBo>();
-                    spanAlign.getSpanBo().setAnnotationBoList(annotationBoList);
+                    spanAlign.getSpanEventBo().setAnnotationBoList(annotationBoList);
                 }
                 annotationReplacementCallback.replacement(spanAlign, annotationBoList);
             }

From 88bacc36ed60e812c5e4c4477a0ae44422b0623f Mon Sep 17 00:00:00 2001
From: Jaehong Kim <jaehong.kim@navercorp.com>
Date: Tue, 24 Mar 2015 18:16:45 +0900
Subject: [PATCH 2/2] #252 refactoring

---
 .../main/java/com/navercorp/pinpoint/common/bo/SpanEventBo.java | 2 +-
 .../com/navercorp/pinpoint/web/service/SpanServiceImpl.java     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/bo/SpanEventBo.java b/commons/src/main/java/com/navercorp/pinpoint/common/bo/SpanEventBo.java
index 20e579df8..e8561fdb0 100644
--- a/commons/src/main/java/com/navercorp/pinpoint/common/bo/SpanEventBo.java
+++ b/commons/src/main/java/com/navercorp/pinpoint/common/bo/SpanEventBo.java
@@ -321,7 +321,7 @@ public class SpanEventBo implements Span {
         this.nextSpanId = nextSpanId;
     }
 
-    private void setAnnotationList(List<TAnnotation> annotations) {
+    public void setAnnotationList(List<TAnnotation> annotations) {
         if (annotations == null) {
             return;
         }
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java b/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java
index 3f687e3fd..19bd5e337 100644
--- a/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java
+++ b/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java
@@ -74,7 +74,6 @@ public class SpanServiceImpl implements SpanService {
 
         SpanResult result = order(spans, selectedSpanHint);
         List<SpanAlign> order = result.getSpanAlignList();
-//        transitionApiId(order);
         transitionDynamicApiId(order);
         transitionSqlId(order);
         transitionCachedString(order);