[dubbo] branch 3.0-multi-instances updated: Default inject ScopeModel in ConfigManager

[al...@apache.org]

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

albumenj pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0-multi-instances by this push:
     new fc8f8cd  Default inject ScopeModel in ConfigManager
fc8f8cd is described below

commit fc8f8cdf662ba38ebb82d66042b15eb5c36651c1
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Sun Aug 29 12:03:46 2021 +0800

    Default inject ScopeModel in ConfigManager
---
 .../main/java/org/apache/dubbo/config/context/ConfigManager.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
index 215753b..f69a67c 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/context/ConfigManager.java
@@ -375,6 +375,9 @@ public class ConfigManager extends LifecycleAdapter implements FrameworkExt, Sco
     // ServiceConfig correlative methods
 
     public void addService(ServiceConfigBase<?> serviceConfig) {
+        if (serviceConfig.getScopeModel() == null) {
+            serviceConfig.setScopeModel(applicationModel.getDefaultModule());
+        }
         addConfig(serviceConfig);
     }
 
@@ -393,6 +396,9 @@ public class ConfigManager extends LifecycleAdapter implements FrameworkExt, Sco
     // ReferenceConfig correlative methods
 
     public void addReference(ReferenceConfigBase<?> referenceConfig) {
+        if (referenceConfig.getScopeModel() == null) {
+            referenceConfig.setScopeModel(applicationModel.getDefaultModule());
+        }
         addConfig(referenceConfig);
     }
 
@@ -466,6 +472,9 @@ public class ConfigManager extends LifecycleAdapter implements FrameworkExt, Sco
         if (config == null) {
             return;
         }
+        if (config.getScopeModel() == null) {
+            config.setScopeModel(applicationModel);
+        }
         addConfig(config, isUniqueConfig(config));
     }