[dubbo] branch 3.0-multi-instances updated: Change default Scope Behave

[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 9f1636d  Change default Scope Behave
9f1636d is described below

commit 9f1636d03eca8de27dedb87dd82fdff3258ecbc8
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Sun Aug 29 09:20:09 2021 +0800

    Change default Scope Behave
---
 .../src/main/java/org/apache/dubbo/rpc/model/ScopeModelUtil.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 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 2544012..7ca3ad5 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
@@ -25,14 +25,14 @@ public class ScopeModelUtil {
             ModuleModel moduleModel = (ModuleModel) scopeModel;
             return moduleModel.getApplicationModel();
         }
-        return null;
+        return ApplicationModel.defaultModel();
     }
 
     public static ModuleModel getModuleModel(ScopeModel scopeModel) {
         if (scopeModel instanceof ModuleModel) {
             return (ModuleModel) scopeModel;
         }
-        return null;
+        return ApplicationModel.defaultModel().getDefaultModule();
     }
 
     public static FrameworkModel getFrameworkModel(ScopeModel scopeModel) {
@@ -44,7 +44,7 @@ public class ScopeModelUtil {
         } else if (scopeModel instanceof FrameworkModel) {
             return (FrameworkModel) scopeModel;
         }
-        return null;
+        return FrameworkModel.defaultModel();
     }
 
 }