Merge pull request #1917 from emeroad/TraceV2/TraceFormatV2

#1819 trace format v2
pinpoint-apm · Jul 19, 2016 · a6d524b · a6d524b
2 parents 93e166b + 2f9a694
commit a6d524b
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...rc/main/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/SpanEncoder.java b/...rc/main/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/SpanEncoder.java
@@ -32,12 +32,14 @@ public int compare(SpanEventBo o1, SpanEventBo o2) {
             final int asyncId2 = o2.getAsyncId();
             final int asyncIdCompare = Integer.compare(asyncId1, asyncId2);
             if (asyncIdCompare != 0) {
-                if (asyncId1 == -1) {
-                    return -1;
-                }
-                if (asyncId2 == -1) {
-                    return -1;
-                }
+//                bug Comparison method violates its general contract!
+//                TODO temporary fix
+//                if (asyncId1 == -1) {
+//                    return -1;
+//                }
+//                if (asyncId2 == -1) {
+//                    return -1;
+//                }
                 return asyncIdCompare;
             }
             return Integer.compare(o1.getAsyncSequence(), o2.getAsyncSequence());