recover proxy config

gaoguanguo · May 3, 2018 · ceb74de · ceb74de
1 parent f1e0b20
commit ceb74de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...e/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlShardingConfigurationForProxy.java b/...e/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlShardingConfigurationForProxy.java
@@ -42,7 +42,7 @@
 @Setter
 public class YamlShardingConfigurationForProxy {
 
-    private Map<String, DataSourceParameter> dataSourceParameters = new HashMap<>();
+    private Map<String, DataSourceParameter> dataSources = new HashMap<>();
 
     private YamlShardingRuleConfiguration shardingRule;
 
@@ -82,6 +82,6 @@ public static YamlShardingConfigurationForProxy unmarshal(final byte[] yamlBytes
      * @return sharding rule from yaml
      */
     public ShardingRule getShardingRule(final Collection<String> dataSourceNames) {
-        return new ShardingRule(shardingRule.getShardingRuleConfiguration(), dataSourceNames.isEmpty() ? dataSourceParameters.keySet() : dataSourceNames);
+        return new ShardingRule(shardingRule.getShardingRuleConfiguration(), dataSourceNames.isEmpty() ? dataSources.keySet() : dataSourceNames);
     }
 }
diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/config/ShardingRuleRegistry.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/config/ShardingRuleRegistry.java
@@ -59,7 +59,7 @@ private ShardingRuleRegistry() {
             throw new ShardingJdbcException(ex);
         }
         dataSourceMap = new HashMap<>(128, 1);
-        Map<String, DataSourceParameter> dataSourceParameters = yamlShardingConfigurationForProxy.getDataSourceParameters();
+        Map<String, DataSourceParameter> dataSourceParameters = yamlShardingConfigurationForProxy.getDataSources();
         for (String each : dataSourceParameters.keySet()) {
             dataSourceMap.put(each, getDataSource(dataSourceParameters.get(each)));
         }