From 8e3e0a3c5536ea01eaed6826b4b2954ffeeef1b8 Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Sun, 4 Mar 2018 11:30:08 +0800
Subject: [PATCH] Clear the duration in query condition when trace id is not
 empty.

---
 .../skywalking/apm/collector/ui/query/TraceQuery.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/TraceQuery.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/TraceQuery.java
index 0ce17ee848..a39c1cf0dd 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/TraceQuery.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/TraceQuery.java
@@ -65,11 +65,11 @@ public class TraceQuery implements Query {
         long endSecondTimeBucket = 0;
         String traceId = Const.EMPTY_STRING;
 
-        if (ObjectUtils.isNotEmpty(condition.getQueryDuration())) {
+        if (StringUtils.isNotEmpty(condition.getTraceId())) {
+            traceId = condition.getTraceId();
+        } else if (ObjectUtils.isNotEmpty(condition.getQueryDuration())) {
             startSecondTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(condition.getQueryDuration().getStep(), condition.getQueryDuration().getStart());
             endSecondTimeBucket = DurationUtils.INSTANCE.durationToSecondTimeBucket(condition.getQueryDuration().getStep(), condition.getQueryDuration().getEnd());
-        } else if (StringUtils.isNotEmpty(condition.getTraceId())) {
-            traceId = condition.getTraceId();
         } else {
             throw new UnexpectedException("The condition must contains either queryDuration or traceId.");
         }
-- 
GitLab