You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2024/01/16 09:52:43 UTC
(shardingsphere) branch master updated: Refactor RuleItemChangedSubscriber ignore database name case avoid npe (#29739)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 9d21e57e735 Refactor RuleItemChangedSubscriber ignore database name case avoid npe (#29739)
9d21e57e735 is described below
commit 9d21e57e73545ba445f2f946465bfdef66b8bb24
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Tue Jan 16 17:52:36 2024 +0800
Refactor RuleItemChangedSubscriber ignore database name case avoid npe (#29739)
---
.../shardingsphere/mode/subsciber/RuleItemChangedSubscriber.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscriber.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscriber.java
index c7213221f30..7d52720f764 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscriber.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/subsciber/RuleItemChangedSubscriber.java
@@ -51,7 +51,7 @@ public final class RuleItemChangedSubscriber {
RuleItemConfigurationChangedProcessor processor = TypedSPILoader.getService(RuleItemConfigurationChangedProcessor.class, event.getType());
String yamlContent =
contextManager.getMetaDataContexts().getPersistService().getMetaDataVersionPersistService().getVersionPathByActiveVersion(event.getActiveVersionKey(), event.getActiveVersion());
- ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabase(event.getDatabaseName());
RuleConfiguration currentRuleConfig = processor.findRuleConfiguration(database);
synchronized (this) {
processor.changeRuleItemConfiguration(event, currentRuleConfig, processor.swapRuleItemConfiguration(event, yamlContent));
@@ -71,7 +71,7 @@ public final class RuleItemChangedSubscriber {
return;
}
RuleItemConfigurationChangedProcessor processor = TypedSPILoader.getService(RuleItemConfigurationChangedProcessor.class, event.getType());
- ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabases().get(event.getDatabaseName());
+ ShardingSphereDatabase database = contextManager.getMetaDataContexts().getMetaData().getDatabase(event.getDatabaseName());
RuleConfiguration currentRuleConfig = processor.findRuleConfiguration(database);
synchronized (this) {
processor.dropRuleItemConfiguration(event, currentRuleConfig);