[dubbo] branch 3.0-multi-instances updated: Fix field override & Fix ut env

[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 a463543  Fix field override & Fix ut env
a463543 is described below

commit a463543b142fe675aef4a9d00083802feebeb4e8
Author: Albumen Kevin <jhq0...@gmail.com>
AuthorDate: Sun Aug 29 15:49:27 2021 +0800

    Fix field override & Fix ut env
---
 .../apache/dubbo/config/bootstrap/DubboBootstrapMultiInstanceTest.java  | 2 ++
 .../java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java     | 1 +
 .../main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java | 2 +-
 .../dubbo/registry/client/metadata/MetadataServiceNameMapping.java      | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapMultiInstanceTest.java
 
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapMultiInstanceTest.java
index 80400c3..bda9199 100644
--- 
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapMultiInstanceTest.java
+++ 
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/DubboBootstrapMultiInstanceTest.java
@@ -26,6 +26,7 @@ import org.apache.dubbo.config.api.DemoService;
 import org.apache.dubbo.config.provider.impl.DemoServiceImpl;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.FrameworkModel;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -35,6 +36,7 @@ public class DubboBootstrapMultiInstanceTest {
     @AfterEach
     protected void afterEach() {
         SysProps.clear();
+        DubboBootstrap.reset();
     }
 
     @Test
diff --git 
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java
 
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java
index 807de6d..f28a25a 100644
--- 
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java
+++ 
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/metadata/MetadataServiceExporterTest.java
@@ -58,6 +58,7 @@ public class MetadataServiceExporterTest {
         MetadataService metadataService = Mockito.mock(MetadataService.class);
         ConfigurableMetadataServiceExporter exporter = new 
ConfigurableMetadataServiceExporter();
         exporter.setMetadataService(metadataService);
+        exporter.setApplicationModel(ApplicationModel.defaultModel());
 
         exporter.export();
         assertTrue(exporter.isExported());
diff --git 
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java
 
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java
index 366bcea..72a7985 100644
--- 
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java
+++ 
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java
@@ -37,7 +37,7 @@ import static 
org.apache.dubbo.common.utils.StringUtils.isBlank;
 
 public abstract class AbstractServiceNameMapping implements 
ServiceNameMapping, ScopeModelAware {
     protected final Logger logger = LoggerFactory.getLogger(getClass());
-    private ApplicationModel applicationModel;
+    protected ApplicationModel applicationModel;
     private WritableMetadataService metadataService;
 
     @Override
diff --git 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
index a0cf07d..adfa7a5 100644
--- 
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
+++ 
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataServiceNameMapping.java
@@ -47,7 +47,6 @@ public class MetadataServiceNameMapping extends 
AbstractServiceNameMapping imple
 
     private static final int CAS_RETRY_TIMES = 6;
     private MetadataReportInstance metadataReportInstance;
-    private ApplicationModel applicationModel;
 
     @Override
     public void map(URL url) {