You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2020/02/20 16:32:48 UTC

[dubbo] branch revert-5754-2.7.5-release created (now 8492441)

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

liujun pushed a change to branch revert-5754-2.7.5-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git.


      at 8492441  Revert "potential NullPointerException fix (#5754)"

This branch includes the following new commits:

     new 8492441  Revert "potential NullPointerException fix (#5754)"

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.



[dubbo] 01/01: Revert "potential NullPointerException fix (#5754)"

Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 84924411aad731b77e5ddf17c3782e686c93f881
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Feb 21 00:32:32 2020 +0800

    Revert "potential NullPointerException fix (#5754)"
    
    This reverts commit b9e837142f5d0e84651c63cdc7afcc8604a07f88.
---
 .../main/java/org/apache/dubbo/config/utils/ConfigValidationUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bb6b1df..b23634f 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
@@ -223,7 +223,7 @@ public class ConfigValidationUtils {
         ApplicationConfig application = interfaceConfig.getApplication();
         AbstractConfig.appendParameters(map, monitor);
         AbstractConfig.appendParameters(map, application);
-        String address = monitor == null ? null : monitor.getAddress();
+        String address = monitor.getAddress();
         String sysaddress = System.getProperty("dubbo.monitor.address");
         if (sysaddress != null && sysaddress.length() > 0) {
             address = sysaddress;