From 76e4c5996d42e2219501e958d3ff7542dfb45daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 2 Nov 2018 15:00:33 +0800 Subject: [PATCH] avoid NPE. (#1869) --- .../mesh/ServiceMeshMetricDataDecorator.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java index 3dae80dea0..8e8a87b660 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java @@ -85,21 +85,23 @@ public class ServiceMeshMetricDataDecorator { } } String endpoint = origin.getEndpoint(); - if (destServiceId != Const.NONE) { - DetectPoint point = origin.getDetectPoint(); - if (DetectPoint.client.equals(point)) { + DetectPoint point = origin.getDetectPoint(); + if (DetectPoint.client.equals(point)) { + if (sourceServiceId != Const.NONE) { endpointId = CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(sourceServiceId, endpoint, org.apache.skywalking.oap.server.core.source.DetectPoint.fromMeshDetectPoint(point)); - } else { + } + } else { + if (destServiceId != Const.NONE) { endpointId = CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(destServiceId, endpoint, org.apache.skywalking.oap.server.core.source.DetectPoint.fromMeshDetectPoint(point)); } + } - if (endpointId != Const.NONE) { - } else { - isRegistered = false; - } + if (endpointId != Const.NONE) { + } else { + isRegistered = false; } return isRegistered; -- GitLab