You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2018/04/25 07:19:11 UTC
[GitHub] wu-sheng closed pull request #1116: Fix judge error caused by pr
#1094
wu-sheng closed pull request #1116: Fix judge error caused by pr #1094
URL: https://github.com/apache/incubator-skywalking/pull/1116
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/NetworkAddressIDService.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/NetworkAddressIDService.java
index d9fb07e35..bc9856c34 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/NetworkAddressIDService.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/NetworkAddressIDService.java
@@ -32,6 +32,7 @@
import org.apache.skywalking.apm.collector.storage.table.register.NetworkAddress;
import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
/**
* @author peng-yongsheng
@@ -122,7 +123,7 @@ private IInstanceIDService getInstanceIDService() {
private boolean compare(int addressId, int spanLayer, int serverType) {
NetworkAddress networkAddress = networkAddressCacheService.getAddress(addressId);
- if (isNull(networkAddress)) {
+ if (nonNull(networkAddress)) {
return spanLayer == networkAddress.getSrcSpanLayer() && serverType == networkAddress.getServerType();
}
return true;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services