[incubator-skywalking] branch exporter-impl updated: Fixed a logical error cause JVM metrics not dispatched. (#2398)

[wu...@apache.org]

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

wusheng pushed a commit to branch exporter-impl
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/exporter-impl by this push:
     new f38aea3  Fixed a logical error cause JVM metrics not dispatched. (#2398)
     new 9793389  Merge branch 'master' into exporter-impl
f38aea3 is described below

commit f38aea3d97c36dbd71c76468dd04a7753e8c70af
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Sat Mar 23 23:40:35 2019 +0800

    Fixed a logical error cause JVM metrics not dispatched. (#2398)
---
 .../server/receiver/jvm/provider/handler/JVMSourceDispatcher.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMSourceDispatcher.java b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMSourceDispatcher.java
index 51aa69f..3d41f69 100644
--- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMSourceDispatcher.java
+++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/handler/JVMSourceDispatcher.java
@@ -18,7 +18,7 @@
 
 package org.apache.skywalking.oap.server.receiver.jvm.provider.handler;
 
-import java.util.List;
+import java.util.*;
 import org.apache.skywalking.apm.network.common.CPU;
 import org.apache.skywalking.apm.network.language.agent.*;
 import org.apache.skywalking.oap.server.core.*;
@@ -45,7 +45,7 @@ public class JVMSourceDispatcher {
     void sendMetric(int serviceInstanceId, long minuteTimeBucket, JVMMetric metric) {
         ServiceInstanceInventory serviceInstanceInventory = instanceInventoryCache.get(serviceInstanceId);
         int serviceId;
-        if (serviceInstanceInventory == null) {
+        if (Objects.nonNull(serviceInstanceInventory)) {
             serviceId = serviceInstanceInventory.getServiceId();
         } else {
             logger.warn("Can't found service by service instance id from cache, service instance id is: {}", serviceInstanceId);
@@ -93,7 +93,8 @@ public class JVMSourceDispatcher {
         });
     }
 
-    private void sendToMemoryMetricProcess(int serviceId, int serviceInstanceId, long timeBucket, List<Memory> memories) {
+    private void sendToMemoryMetricProcess(int serviceId, int serviceInstanceId, long timeBucket,
+        List<Memory> memories) {
         memories.forEach(memory -> {
             ServiceInstanceJVMMemory serviceInstanceJVMMemory = new ServiceInstanceJVMMemory();
             serviceInstanceJVMMemory.setId(serviceInstanceId);