[dubbo] branch 3.0 updated: 修复monitor未配置时返回dubbo协议的问题 (#8549)

[crazyhzm]

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

crazyhzm 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 5630a3c  修复monitor未配置时返回dubbo协议的问题 (#8549)
5630a3c is described below

commit 5630a3c1fd390ace46f5bf3f7916f9390681f1b1
Author: 张远征hd <zhangy...@163.com>
AuthorDate: Fri Aug 20 11:41:25 2021 +0800

    修复monitor未配置时返回dubbo协议的问题 (#8549)
---
 .../org/apache/dubbo/config/utils/ConfigValidationUtils.java   |  2 +-
 .../org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
index d6188b7..47ccae9 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java
@@ -312,7 +312,7 @@ public class ConfigValidationUtils {
         } else if (monitor != null) {
             address = monitor.getAddress();
         }
-        String protocol = monitor == null ? DUBBO_PROTOCOL : 
monitor.getProtocol();
+        String protocol = monitor == null ? null : monitor.getProtocol();
         if (monitor != null &&
             (REGISTRY_PROTOCOL.equals(protocol) || 
SERVICE_REGISTRY_PROTOCOL.equals(protocol))
             && registryURL != null) {
diff --git 
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java
 
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java
index 068cb69..7a5c68a 100644
--- 
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java
+++ 
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapTest.java
@@ -174,6 +174,12 @@ public class DubboBootstrapTest {
     }
 
     @Test
+    public void testLoadUserMonitor_no_monitor() {
+        URL url = 
ConfigValidationUtils.loadMonitor(getTestInterfaceConfig(null), 
URL.valueOf("zookeeper://127.0.0.1:2181"));
+        Assertions.assertNull(url);
+    }
+
+    @Test
     public void testLoadUserMonitor_user() {
         // dubbo.monitor.protocol=user
         MonitorConfig monitorConfig = new MonitorConfig();
@@ -197,7 +203,9 @@ public class DubboBootstrapTest {
     private AbstractInterfaceConfigTest.InterfaceConfig 
getTestInterfaceConfig(MonitorConfig monitorConfig) {
         AbstractInterfaceConfigTest.InterfaceConfig interfaceConfig = new 
AbstractInterfaceConfigTest.InterfaceConfig();
         interfaceConfig.setApplication(new 
ApplicationConfig("testLoadMonitor"));
-        interfaceConfig.setMonitor(monitorConfig);
+        if(monitorConfig!=null) {
+            interfaceConfig.setMonitor(monitorConfig);
+        }
         return interfaceConfig;
     }