You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ki...@apache.org on 2020/08/27 12:12:06 UTC
[shardingsphere] branch master updated: Remove useless code (#7105)
This is an automated email from the ASF dual-hosted git repository.
kimmking 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 3743e8a Remove useless code (#7105)
3743e8a is described below
commit 3743e8a56fa6562e390997f6bf5bb2804d372088
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Thu Aug 27 20:11:51 2020 +0800
Remove useless code (#7105)
---
.../orchestration/core/schema/OrchestrationSchemaContexts.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-schema/src/main/java/org/apache/shardingsphere/orchestration/core/schema/OrchestrationSchemaContexts.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-schema/src/main/java/org/apache/shardingsphere/orchestration/core/schema/OrchestrationSchemaContexts.java
index 64e01da..125e91d 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-schema/src/main/java/org/apache/shardingsphere/orchestration/core/schema/OrchestrationSchemaContexts.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-schema/src/main/java/org/apache/shardingsphere/orchestration/core/schema/OrchestrationSchemaContexts.java
@@ -317,12 +317,8 @@ public abstract class OrchestrationSchemaContexts implements SchemaContexts {
Map<String, DataSource> result = new LinkedHashMap<>(oldDataSources);
result.keySet().removeAll(deletedDataSources);
result.keySet().removeAll(modifiedDataSources.keySet());
- if (null != modifiedDataSources) {
- result.putAll(modifiedDataSources);
- }
- if (null != addedDataSources) {
- result.putAll(addedDataSources);
- }
+ result.putAll(modifiedDataSources);
+ result.putAll(addedDataSources);
return result;
}