You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/03/04 08:44:00 UTC
[skywalking] 01/01: forward compatbility for DCS
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch dcs-uuid-bug
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 93f89d4abdfdc946d72a90db1b9ecff542141675
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Mar 4 16:43:39 2020 +0800
forward compatbility for DCS
---
.../oap/server/configuration/grpc/GRPCConfigWatcherRegister.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java
index 1332e0b..9735459 100644
--- a/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java
+++ b/oap-server/server-configuration/grpc-configuration-sync/src/main/java/org/apache/skywalking/oap/server/configuration/grpc/GRPCConfigWatcherRegister.java
@@ -57,7 +57,7 @@ public class GRPCConfigWatcherRegister extends ConfigWatcherRegister {
}
ConfigurationResponse response = stub.call(builder.build());
String responseUuid = response.getUuid();
- if (Objects.equals(uuid, responseUuid)) {
+ if (responseUuid != null && Objects.equals(uuid, responseUuid)) {
// If UUID matched, the config table is expected as empty.
return Optional.empty();
}