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 2022/10/09 04:42:14 UTC
[shardingsphere] branch master updated: Revert "Fix NPE when all data sources are unavailable (#21412)" (#21414)
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 4b303f993ea Revert "Fix NPE when all data sources are unavailable (#21412)" (#21414)
4b303f993ea is described below
commit 4b303f993eab781960a0bd389c429a144a381357
Author: ZhangCheng <fl...@outlook.com>
AuthorDate: Sun Oct 9 12:42:05 2022 +0800
Revert "Fix NPE when all data sources are unavailable (#21412)" (#21414)
This reverts commit ada66afa030693f7d83a72ca3918a90c78f75e56.
---
.../infra/metadata/database/resource/ShardingSphereResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResource.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResource.java
index 76b917fd30d..43598b352d5 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResource.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/ShardingSphereResource.java
@@ -54,7 +54,7 @@ public final class ShardingSphereResource {
}
private DatabaseType getDatabaseType(final Map<String, DataSource> dataSources) {
- return DatabaseTypeEngine.getDatabaseType(dataSources.values());
+ return dataSources.isEmpty() ? null : DatabaseTypeEngine.getDatabaseType(dataSources.values());
}
private Map<String, DataSourceMetaData> createDataSourceMetaDataMap(final Map<String, DataSource> dataSources) {