[incubator-dubbo] branch 2.7.0-release updated: Fix wrong reference

[liujun]

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

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


The following commit(s) were added to refs/heads/2.7.0-release by this push:
     new 1f2122e  Fix wrong reference
1f2122e is described below

commit 1f2122e6b77c7816d34e67e99dcdd1606e226902
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Wed Jan 9 20:32:29 2019 +0800

    Fix wrong reference
---
 .../main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java  | 6 +++---
 .../main/java/org/apache/dubbo/config/AbstractServiceConfig.java    | 4 ++--
 .../src/main/java/org/apache/dubbo/config/ReferenceConfig.java      | 5 +----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index 3d0f025..b9d6173 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -694,7 +694,7 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
     }
 
     public void setApplication(ApplicationConfig application) {
-        ConfigManager.getInstance().setApplication(this.application);
+        ConfigManager.getInstance().setApplication(application);
         this.application = application;
     }
 
@@ -739,7 +739,7 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
 
     @SuppressWarnings({"unchecked"})
     public void setRegistries(List<? extends RegistryConfig> registries) {
-        ConfigManager.getInstance().addRegistries(this.registries);
+        ConfigManager.getInstance().addRegistries((List<RegistryConfig>) 
registries);
         this.registries = (List<RegistryConfig>) registries;
     }
 
@@ -757,7 +757,7 @@ public abstract class AbstractInterfaceConfig extends 
AbstractMethodConfig {
     }
 
     public void setMonitor(String monitor) {
-        this.monitor = new MonitorConfig(monitor);
+        setMonitor(new MonitorConfig(monitor));
     }
 
     public void setMonitor(MonitorConfig monitor) {
diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
index 0e996f9..069cd9d 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java
@@ -200,7 +200,7 @@ public abstract class AbstractServiceConfig extends 
AbstractInterfaceConfig {
 
     @SuppressWarnings({"unchecked"})
     public void setProtocols(List<? extends ProtocolConfig> protocols) {
-        ConfigManager.getInstance().addProtocols(this.protocols);
+        ConfigManager.getInstance().addProtocols((List<ProtocolConfig>) 
protocols);
         this.protocols = (List<ProtocolConfig>) protocols;
     }
 
@@ -209,7 +209,7 @@ public abstract class AbstractServiceConfig extends 
AbstractInterfaceConfig {
     }
 
     public void setProtocol(ProtocolConfig protocol) {
-        this.protocols = Arrays.asList(protocol);
+        setProtocols(Arrays.asList(protocol));
     }
 
     @Parameter(excluded = true)
diff --git 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index 02c9981..bafeffc 100644
--- 
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++ 
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -540,11 +540,8 @@ public class ReferenceConfig<T> extends 
AbstractReferenceConfig {
     }
 
     public void setConsumer(ConsumerConfig consumer) {
-        if (consumer == null) {
-            return;
-        }
-        this.consumer = consumer;
         ConfigManager.getInstance().addConsumer(consumer);
+        this.consumer = consumer;
     }
 
     public String getProtocol() {