[skywalking] branch dcs-uuid-bug created (now 93f89d4)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch dcs-uuid-bug
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


      at 93f89d4  forward compatbility for DCS

This branch includes the following new commits:

     new 93f89d4  forward compatbility for DCS

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[skywalking] 01/01: forward compatbility for DCS

[wu...@apache.org]

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();
             }