[incubator-servicecomb-java-chassis] 13/14: JAV-508 & SCB-11 fix pr comment

[ni...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit d79b69aa98a5d33adb2ac76cd6301a0b57239c34
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Tue Jan 2 15:57:30 2018 +0800

    JAV-508 & SCB-11 fix pr comment
    
    Signed-off-by: zhengyangyong <ya...@huawei.com>
---
 .../servicecomb/metrics/core/publish/DefaultDataSource.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java
index 22fb846..81c439b 100644
--- a/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java
+++ b/metrics/metrics-core/src/main/java/io/servicecomb/metrics/core/publish/DefaultDataSource.java
@@ -83,13 +83,13 @@ public class DefaultDataSource implements DataSource {
 
   @Override
   public RegistryMetric getRegistryMetric(long windowTime) {
-    if (appliedWindowTimes.containsKey(windowTime)) {
-      return registryMonitor.toRegistryMetric(appliedWindowTimes.get(windowTime));
-    } else {
-      throw new InvocationException(BAD_REQUEST,
-          "windowTime : " + windowTime + " unset in servicecomb.metrics.window_time,current available are : " +
-              Strings.join(",", getAppliedWindowTime().iterator()));
+    Integer index = appliedWindowTimes.get(windowTime);
+    if (index != null) {
+      return registryMonitor.toRegistryMetric(index);
     }
+    throw new InvocationException(BAD_REQUEST,
+        "windowTime : " + windowTime + " unset in servicecomb.metrics.window_time,current available are : " +
+            Strings.join(",", getAppliedWindowTime().iterator()));
   }
 
   @Override

-- 
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.