You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/06 13:46:28 UTC
[shardingsphere] branch master updated: fix cr suggestions (#6285)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun 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 183fa8c fix cr suggestions (#6285)
183fa8c is described below
commit 183fa8c40a5122a99e7f8a2e6378ee98c828b612
Author: xbkaishui <xb...@126.com>
AuthorDate: Mon Jul 6 21:46:13 2020 +0800
fix cr suggestions (#6285)
---
.../shardingsphere/proxy/config/ShardingConfigurationLoader.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoader.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoader.java
index 2f0b04c..a9fb5e0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoader.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoader.java
@@ -53,7 +53,6 @@ public final class ShardingConfigurationLoader {
* @throws IOException IO exception
*/
public ShardingConfiguration load(final String path) throws IOException {
- //this is just check for schemaName duplication
Collection<String> schemaNames = new HashSet<>();
YamlProxyServerConfiguration serverConfig = loadServerConfiguration(getResourceFile(path + "/" + SERVER_CONFIG_FILE));
File configPath = getResourceFile(path);
@@ -72,10 +71,9 @@ public final class ShardingConfigurationLoader {
private File getResourceFile(final String path) {
URL url = ShardingConfigurationLoader.class.getResource(path);
- if (url != null) {
+ if (null != url) {
return new File(url.getFile());
}
- //try absolute path
return new File(path);
}