[dubbo] branch master updated: fix for #4175: ServiceConfigurationListener should override ProviderConfigurationListener (#4179)

[huxing]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4b97a0b  fix for #4175: ServiceConfigurationListener should override 
ProviderConfigurationListener (#4179)
4b97a0b is described below

commit 4b97a0ba8b5edcedb37a320e00cd5bc36f304f90
Author: uglycow <xieyun...@gmail.com>
AuthorDate: Wed May 29 10:27:03 2019 +0800

    fix for #4175: ServiceConfigurationListener should override 
ProviderConfigurationListener (#4179)
---
 .../java/org/apache/dubbo/registry/integration/RegistryProtocol.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
index 96b060f..b9ad1b3 100644
--- 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -557,9 +557,9 @@ public class RegistryProtocol implements Protocol {
             URL currentUrl = exporter.getInvoker().getUrl();
             //Merged with this configuration
             URL newUrl = getConfigedInvokerUrl(configurators, originUrl);
+            newUrl = 
getConfigedInvokerUrl(providerConfigurationListener.getConfigurators(), newUrl);
             newUrl = 
getConfigedInvokerUrl(serviceConfigurationListeners.get(originUrl.getServiceKey())
                     .getConfigurators(), newUrl);
-            newUrl = 
getConfigedInvokerUrl(providerConfigurationListener.getConfigurators(), newUrl);
             if (!currentUrl.equals(newUrl)) {
                 RegistryProtocol.this.reExport(originInvoker, newUrl);
                 logger.info("exported provider url changed, origin url: " + 
originUrl +