[dubbo] branch 3.0 updated: Inject ScopeModel when adding into ConfigManger (#8728)

[al...@apache.org]

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

albumenj 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 09f1f9a  Inject ScopeModel when adding into ConfigManger (#8728)
09f1f9a is described below

commit 09f1f9a3d2db2888953a90816abcc24f5640fc5c
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Wed Sep 8 19:43:29 2021 +0800

    Inject ScopeModel when adding into ConfigManger (#8728)
---
 .../main/java/org/apache/dubbo/config/context/ConfigManager.java    | 6 ++++++
 1 file changed, 6 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 c1879d6..7bae399 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
@@ -28,6 +28,7 @@ import org.apache.dubbo.common.utils.ReflectUtils;
 import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.config.AbstractConfig;
 import org.apache.dubbo.config.AbstractInterfaceConfig;
+import org.apache.dubbo.config.AbstractMethodConfig;
 import org.apache.dubbo.config.ApplicationConfig;
 import org.apache.dubbo.config.ConfigCenterConfig;
 import org.apache.dubbo.config.ConfigKeys;
@@ -491,6 +492,11 @@ public class ConfigManager extends LifecycleAdapter implements FrameworkExt {
         if (config == null) {
             return null;
         }
+
+        if(!(config instanceof AbstractMethodConfig)) {
+            config.setScopeModel(applicationModel);
+        }
+
         // ignore MethodConfig
         if (config instanceof MethodConfig) {
             return null;