[dubbo] branch 3.0 updated: Fix NopDynamicConfiguration cause NPE (#7134)

[al...@apache.org]

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

albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new affbd63  Fix NopDynamicConfiguration cause NPE (#7134)
affbd63 is described below

commit affbd638e6c39653fe3fd3893e55697123775917
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Wed Jan 27 19:01:52 2021 +0800

    Fix NopDynamicConfiguration cause NPE (#7134)
---
 .../dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java
index 5277492..213e8c2 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/configcenter/nop/NopDynamicConfiguration.java
@@ -20,6 +20,8 @@ import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.configcenter.ConfigurationListener;
 import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
 
+import static java.util.Collections.emptySortedSet;
+
 import java.util.SortedSet;
 
 /**
@@ -67,6 +69,6 @@ public class NopDynamicConfiguration implements DynamicConfiguration {
      */
     @Override
     public SortedSet<String> getConfigKeys(String group) {
-        return null;
+        return emptySortedSet();
     }
 }