Merge pull request #3135 from beiwei30:registry-refresh-redo, avoid d…

…up refresh for registry config. * avoid dup refresh for registry config * fix unit test * fix unit test, org.apache.dubbo.config.AbstractInterfaceConfig#convertRegistryIdsToRegistries generates invalid registry config * should not give RegistryConfig a default value 'RegistryConfig.NO_AVAILABLE'
apache · Jan 6, 2019 · ec8a5b9 · ec8a5b9
1 parent 5c971c1
commit ec8a5b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/...onfig/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java b/...onfig/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -228,7 +228,6 @@ protected void checkMetadataReport() {
      */
     protected List<URL> loadRegistries(boolean provider) {
         // check && override if necessary
-        checkRegistry();
         List<URL> registryList = new ArrayList<URL>();
         if (registries != null && !registries.isEmpty()) {
             for (RegistryConfig config : registries) {

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
@@ -218,6 +218,7 @@ public void checkAndUpdateSubConfigs() {
             inheritIfAbsentFromApplication();
         }
         checkApplication();
+        checkRegistry();
         checkMetadataReport();
     }
 

diff --git a/...g/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java b/...g/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
@@ -118,6 +118,8 @@ public void checkApplication2() throws Exception {
     public void testLoadRegistries() throws Exception {
         System.setProperty("dubbo.registry.address", "addr1");
         InterfaceConfig interfaceConfig = new InterfaceConfig();
+        // FIXME: now we need to check first, then load
+        interfaceConfig.checkRegistry();
         List<URL> urls = interfaceConfig.loadRegistries(true);
         TestCase.assertEquals(1, urls.size());
         URL url = urls.get(0);