From e6aa1fe3d0aada1a3ab8dfe746ec4a53cbae4a5e Mon Sep 17 00:00:00 2001
From: Woonduk Kang <wd.kang@navercorp.com>
Date: Mon, 18 Feb 2013 01:43:10 +0000
Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?=
 =?UTF-8?q?=20next=20spanid=EB=A5=BC=20=ED=9A=8D=EB=93=9D=ED=95=A0?=
 =?UTF-8?q?=EB=95=8C=20=EB=B3=B4=EB=AA=A8=EC=9D=98=20spanId=EC=99=80=20par?=
 =?UTF-8?q?entSpanId=EB=A5=BC=20=EB=91=98=EB=8B=A4=20=EC=B2=B4=ED=81=AC?=
 =?UTF-8?q?=ED=95=B4=EC=84=9C=20=EC=95=88=EA=B2=B9=EC=B9=98=EA=B2=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@1211 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 src/main/java/com/profiler/context/SpanID.java  | 6 +++---
 src/main/java/com/profiler/context/TraceID.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/profiler/context/SpanID.java b/src/main/java/com/profiler/context/SpanID.java
index 3149af886..5141745b9 100644
--- a/src/main/java/com/profiler/context/SpanID.java
+++ b/src/main/java/com/profiler/context/SpanID.java
@@ -6,7 +6,7 @@ public class SpanID {
 
     public static final int NULL = -1;
 
-    private static Random seed = new Random();
+    private static final Random seed = new Random();
 
     public static int newSpanID() {
         int id = seed.nextInt();
@@ -16,9 +16,9 @@ public class SpanID {
         return id;
     }
 
-    public static int nextSpanID(long parentId) {
+    public static int nextSpanID(int spanId, int parentSpanId) {
         int newId = newSpanID();
-        while (newId == parentId) {
+        while (newId == spanId || newId == parentSpanId) {
             newId = newSpanID();
         }
         return newId;
diff --git a/src/main/java/com/profiler/context/TraceID.java b/src/main/java/com/profiler/context/TraceID.java
index 70a986e62..1d899ffbb 100644
--- a/src/main/java/com/profiler/context/TraceID.java
+++ b/src/main/java/com/profiler/context/TraceID.java
@@ -15,7 +15,7 @@ public class TraceID {
 	}
 
 	public TraceID getNextTraceId() {
-		return new TraceID(id, spanId, SpanID.nextSpanID(spanId), sampled, flags);
+		return new TraceID(id, spanId, SpanID.nextSpanID(spanId, parentSpanId), sampled, flags);
 	}
 
 	public TraceID(UUID id, int parentSpanId, int spanId, boolean sampled, short flags) {