[dubbo] branch 3.0-multi-instances updated: Fix inject default model when scope is parent

[albumenj]

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 af6e0c5  Fix inject default model when scope is parent
af6e0c5 is described below

commit af6e0c5c21d5d4ffd8a1695cf847c05b94ff14b1
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Sun Aug 29 10:13:36 2021 +0800

    Fix inject default model when scope is parent
---
 .../org/apache/dubbo/rpc/model/ScopeModelUtil.java | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModelUtil.java 
b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModelUtil.java
index 7ca3ad5..7b93562 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModelUtil.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModelUtil.java
@@ -18,6 +18,16 @@ package org.apache.dubbo.rpc.model;
 
 public class ScopeModelUtil {
 
+    public static ModuleModel getModuleModel(ScopeModel scopeModel) {
+        if (scopeModel instanceof ModuleModel) {
+            return (ModuleModel) scopeModel;
+        }
+        if (scopeModel == null) {
+            ApplicationModel.defaultModel().getDefaultModule();
+        }
+        return null;
+    }
+
     public static ApplicationModel getApplicationModel(ScopeModel scopeModel) {
         if (scopeModel instanceof ApplicationModel) {
             return (ApplicationModel) scopeModel;
@@ -25,14 +35,10 @@ public class ScopeModelUtil {
             ModuleModel moduleModel = (ModuleModel) scopeModel;
             return moduleModel.getApplicationModel();
         }
-        return ApplicationModel.defaultModel();
-    }
-
-    public static ModuleModel getModuleModel(ScopeModel scopeModel) {
-        if (scopeModel instanceof ModuleModel) {
-            return (ModuleModel) scopeModel;
+        if (scopeModel == null) {
+            ApplicationModel.defaultModel();
         }
-        return ApplicationModel.defaultModel().getDefaultModule();
+        return null;
     }
 
     public static FrameworkModel getFrameworkModel(ScopeModel scopeModel) {
@@ -44,7 +50,10 @@ public class ScopeModelUtil {
         } else if (scopeModel instanceof FrameworkModel) {
             return (FrameworkModel) scopeModel;
         }
-        return FrameworkModel.defaultModel();
+        if (scopeModel == null) {
+            FrameworkModel.defaultModel();
+        }
+        return null;
     }
 
 }