From 4a2104d25e21b66e9582e6cd06f9e01a63f4122c Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 20 Mar 2017 17:49:57 +0800 Subject: [PATCH] New TraceSegmentRef.equals/hashCode. --- .../java/com/a/eye/skywalking/trace/TraceSegmentRef.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java index e900a71829..5375fa0816 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java @@ -86,7 +86,6 @@ public class TraceSegmentRef{ '}'; } - @Override public boolean equals(Object o) { if (this == o) @@ -96,15 +95,15 @@ public class TraceSegmentRef{ TraceSegmentRef ref = (TraceSegmentRef)o; - if (traceSegmentId != null ? !traceSegmentId.equals(ref.traceSegmentId) : ref.traceSegmentId != null) + if (spanId != ref.spanId) return false; - return applicationCode != null ? applicationCode.equals(ref.applicationCode) : ref.applicationCode == null; + return traceSegmentId != null ? traceSegmentId.equals(ref.traceSegmentId) : ref.traceSegmentId == null; } @Override public int hashCode() { int result = traceSegmentId != null ? traceSegmentId.hashCode() : 0; - result = 31 * result + (applicationCode != null ? applicationCode.hashCode() : 0); + result = 31 * result + spanId; return result; } } -- GitLab