kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid NPE. (#1869)

This commit is contained in:
吴晟 Wu Sheng 2018-11-02 15:00:33 +08:00 committed by GitHub
parent 75e4c67952
commit 76e4c5996d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java
View File

@ -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;