[shardingsphere] branch master updated: Fix map get issue with meta data renew (#12697)

[zhonghongsheng]

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

zhonghongsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 281df69  Fix map get issue with meta data renew (#12697)
281df69 is described below

commit 281df693fb822a356bf16d7e1b0e25a92af167d9
Author: Liang Zhang <terrym...@163.com>
AuthorDate: Fri Sep 24 21:41:05 2021 +0800

    Fix map get issue with meta data renew (#12697)
---
 .../manager/cluster/coordinator/ClusterContextManagerCoordinator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
index cc06a83..d64fd8f 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterContextManagerCoordinator.java
@@ -289,7 +289,7 @@ public final class ClusterContextManagerCoordinator {
         Map<String, Collection<RuleConfiguration>> schemaRuleConfigs = 
Collections.singletonMap(originalMetaData.getName(), ruleConfigs);
         Properties props = 
contextManager.getMetaDataContexts().getProps().getProps();
         Map<String, ShardingSphereSchema> schemas = new 
SchemaLoader(dataSourcesMap, schemaRuleConfigs, props).load();
-        
metaDataPersistService.getSchemaMetaDataService().persist(originalMetaData.getName(),
 schemas.get(originalMetaData.getSchema()));
+        
metaDataPersistService.getSchemaMetaDataService().persist(originalMetaData.getName(),
 schemas.get(originalMetaData.getName()));
         return new MetaDataContextsBuilder(dataSourcesMap, schemaRuleConfigs, 
metaDataPersistService.getGlobalRuleService().load(), schemas, 
props).build(metaDataPersistService);
     }
     
@@ -301,7 +301,7 @@ public final class ClusterContextManagerCoordinator {
         Map<String, Collection<RuleConfiguration>> schemaRuleConfigs = 
Collections.singletonMap(originalMetaData.getName(), 
originalMetaData.getRuleMetaData().getConfigurations());
         Properties props = 
contextManager.getMetaDataContexts().getProps().getProps();
         Map<String, ShardingSphereSchema> schemas = new 
SchemaLoader(dataSourcesMap, schemaRuleConfigs, props).load();
-        
metaDataPersistService.getSchemaMetaDataService().persist(originalMetaData.getName(),
 schemas.get(originalMetaData.getSchema()));
+        
metaDataPersistService.getSchemaMetaDataService().persist(originalMetaData.getName(),
 schemas.get(originalMetaData.getName()));
         return new MetaDataContextsBuilder(dataSourcesMap, schemaRuleConfigs, 
metaDataPersistService.getGlobalRuleService().load(), schemas, 
props).build(metaDataPersistService);
     }