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/11/06 06:37:16 UTC

[dubbo] branch 3.0 updated: Make sure instance and meta registered to remote when interface delay publish enabled. (#6868)

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

liujun 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 924ee55  Make sure instance and meta registered to remote when interface delay publish enabled. (#6868)
924ee55 is described below

commit 924ee551fb2f8d14fe56d210adba1f8e4a72b106
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Nov 6 14:30:11 2020 +0800

    Make sure instance and meta registered to remote when interface delay publish enabled. (#6868)
---
 .../src/main/java/org/apache/dubbo/config/ReferenceConfig.java     | 3 ++-
 .../src/main/java/org/apache/dubbo/config/ServiceConfig.java       | 3 ++-
 .../java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java     | 7 +------
 3 files changed, 5 insertions(+), 8 deletions(-)

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 f38b80b..7c6d463 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
@@ -233,7 +233,8 @@ public class ReferenceConfig<T> extends ReferenceConfigBase<T> {
 
         if (bootstrap == null) {
             bootstrap = DubboBootstrap.getInstance();
-            bootstrap.init();
+            bootstrap.initialize();
+            bootstrap.reference(this);
         }
 
         checkAndUpdateSubConfigs();
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 2afe2b1..e63c4f3 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -182,13 +182,14 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
     }
 
     public synchronized void export() {
-        if (!shouldExport()) {
+        if (!shouldExport() || exported) {
             return;
         }
 
         if (bootstrap == null) {
             bootstrap = DubboBootstrap.getInstance();
             bootstrap.initialize();
+            bootstrap.service(this);
         }
 
         checkAndUpdateSubConfigs();
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
index 9aa3455..e74a5e4 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
@@ -511,11 +511,6 @@ public class DubboBootstrap extends GenericEventListener {
         return this;
     }
 
-    @Deprecated
-    public void init() {
-        initialize();
-    }
-
     /**
      * Initialize
      */
@@ -928,7 +923,7 @@ public class DubboBootstrap extends GenericEventListener {
     }
 
     private boolean hasExportedServices() {
-        return !metadataService.getExportedURLs().isEmpty();
+        return CollectionUtils.isNotEmpty(configManager.getServices());
     }
 
     /**