[dubbo] branch 2.7.6-release updated: Fix consul, getproperty return null if key does not match a value. (#5850)

[li...@apache.org]

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

liujun pushed a commit to branch 2.7.6-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/2.7.6-release by this push:
     new 08140f2  Fix consul, getproperty return null if key does not match a value. (#5850)
08140f2 is described below

commit 08140f285926c6ecf0d5e67925cae923c9ff1a8c
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Mar 13 14:18:29 2020 +0800

    Fix consul, getproperty return null if key does not match a value. (#5850)
---
 .../apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java    | 2 +-
 .../dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java
index f1aeed2..282bdef 100644
--- a/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-consul/src/main/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfiguration.java
@@ -151,7 +151,7 @@ public class ConsulDynamicConfiguration implements DynamicConfiguration {
     @Override
     public Object getInternalProperty(String key) {
         logger.info("getting config from: " + key);
-        return kvClient.getValueAsString(key, Charsets.UTF_8).orElseThrow(() -> new IllegalArgumentException(key + " does not exit."));
+        return kvClient.getValueAsString(key, Charsets.UTF_8).orElse(null);
     }
 
     @Override
diff --git a/dubbo-configcenter/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java b/dubbo-configcenter/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java
index 4231f84..8ada5fb 100644
--- a/dubbo-configcenter/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java
+++ b/dubbo-configcenter/dubbo-configcenter-consul/src/test/java/org/apache/dubbo/configcenter/consul/ConsulDynamicConfigurationTest.java
@@ -71,7 +71,7 @@ public class ConsulDynamicConfigurationTest {
         assertEquals("bar", configuration.getConfig("foo", "dubbo"));
         // test does not block
         assertEquals("bar", configuration.getConfig("foo", "dubbo"));
-        Assertions.assertThrows(IllegalArgumentException.class, () -> configuration.getConfig("not-exist", "dubbo"));
+        Assertions.assertNull(configuration.getConfig("not-exist", "dubbo"));
     }
 
     @Test