modify SpringMasterSlaveDataSource constructor.

xuse · Jul 19, 2018 · ec6eb6b · ec6eb6b
1 parent 8301899
commit ec6eb6b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...a/io/shardingsphere/jdbc/orchestration/spring/datasource/SpringMasterSlaveDataSource.java b/...a/io/shardingsphere/jdbc/orchestration/spring/datasource/SpringMasterSlaveDataSource.java
@@ -25,6 +25,7 @@
 import javax.sql.DataSource;
 import java.sql.SQLException;
 import java.util.Collection;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Properties;
 
@@ -38,13 +39,15 @@ public class SpringMasterSlaveDataSource extends MasterSlaveDataSource {
 
     public SpringMasterSlaveDataSource(final Map<String, DataSource> dataSourceMap, final String name, 
                                        final String masterDataSourceName, final Collection<String> slaveDataSourceNames, final MasterSlaveLoadBalanceAlgorithm strategy, final Map<String, Object> configMap, final Properties props) throws SQLException {
-        super(dataSourceMap, getMasterSlaveRuleConfiguration(name, masterDataSourceName, slaveDataSourceNames, strategy), configMap, props);
+        super(dataSourceMap, getMasterSlaveRuleConfiguration(name, masterDataSourceName, slaveDataSourceNames, strategy),
+                null == configMap ? new LinkedHashMap<String, Object>() : configMap, null == props ? new Properties() : props);
     }
 
     public SpringMasterSlaveDataSource(final Map<String, DataSource> dataSourceMap, final String name, 
                                        final String masterDataSourceName, final Collection<String> slaveDataSourceNames, final MasterSlaveLoadBalanceAlgorithmType strategyType, final Map<String, Object> configMap, final Properties props) throws SQLException {
         super(dataSourceMap, 
-                getMasterSlaveRuleConfiguration(name, masterDataSourceName, slaveDataSourceNames, null == strategyType ? null : strategyType.getAlgorithm()), configMap, props);
+                getMasterSlaveRuleConfiguration(name, masterDataSourceName, slaveDataSourceNames, null == strategyType ? null : strategyType.getAlgorithm()),
+                null == configMap ? new LinkedHashMap<String, Object>() : configMap, null == props ? new Properties() : props);
     }
 
     private static MasterSlaveRuleConfiguration getMasterSlaveRuleConfiguration(