未验证 提交 76e4c599 编写于 作者: wu-sheng's avatar wu-sheng 提交者: GitHub

avoid NPE. (#1869)

上级 75e4c679
...@@ -85,21 +85,23 @@ public class ServiceMeshMetricDataDecorator { ...@@ -85,21 +85,23 @@ public class ServiceMeshMetricDataDecorator {
} }
} }
String endpoint = origin.getEndpoint(); 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, endpointId = CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(sourceServiceId, endpoint,
org.apache.skywalking.oap.server.core.source.DetectPoint.fromMeshDetectPoint(point)); org.apache.skywalking.oap.server.core.source.DetectPoint.fromMeshDetectPoint(point));
} else { }
} else {
if (destServiceId != Const.NONE) {
endpointId = CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(destServiceId, endpoint, endpointId = CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(destServiceId, endpoint,
org.apache.skywalking.oap.server.core.source.DetectPoint.fromMeshDetectPoint(point)); org.apache.skywalking.oap.server.core.source.DetectPoint.fromMeshDetectPoint(point));
} }
}
if (endpointId != Const.NONE) { if (endpointId != Const.NONE) {
} else { } else {
isRegistered = false; isRegistered = false;
}
} }
return isRegistered; return isRegistered;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册