mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-05-04 13:30:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3771 from actiontech/inner-2298

Browse Source 
[inner-2298] fix npe
This commit is contained in:
wenyh
2023-07-19 11:08:59 +08:00
committed by GitHub
parent 5efe29010b f3dece2ee6
commit c037ff3405
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/actiontech/dble/config/ServerConfig.java
+2 -2
View File
@@ -274,12 +274,12 @@ public class ServerConfig {
//check shardingNode and dbGroup change
List<String> strShardingNodes = newSchemaConfig.getDefaultShardingNodes();
String strApNode = newSchemaConfig.getDefaultApNode();
if (isShardingNodeChanged(strShardingNodes, newShardingNodes) || isApNodeChanged(strApNode, newApNodes)) {
if (isShardingNodeChanged(strShardingNodes, newShardingNodes) || (!StringUtil.isBlank(strApNode) && isApNodeChanged(strApNode, newApNodes))) {
delSchema.add(oldSchema);
reloadSchema.add(oldSchema);
continue;
} else if ((loadAllMode & ManagerParseConfig.OPTS_MODE) == 0 &&
(isDbGroupChanged(strShardingNodes, newShardingNodes) || isDbGroupChangedByApNode(strApNode, newApNodes))) { // reload @@config_all not contains -s
(isDbGroupChanged(strShardingNodes, newShardingNodes) || (!StringUtil.isBlank(strApNode) && isDbGroupChangedByApNode(strApNode, newApNodes)))) { // reload @@config_all not contains -s
delSchema.add(oldSchema);
reloadSchema.add(oldSchema);
continue;