[shardingsphere] branch master updated: Fixes #15268. (#15269)

[zhangliang]

This is an automated email from the ASF dual-hosted git repository.

zhangliang 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 e336526  Fixes #15268. (#15269)
e336526 is described below

commit e336526df1d7476826b487df631400ae618bf168
Author: yx9o <yangx_s...@163.com>
AuthorDate: Mon Feb 7 00:16:25 2022 +0800

    Fixes #15268. (#15269)
    
    * Fixes #15268.
    
    * Update.
---
 .../infra/datasource/pool/creator/DataSourcePoolCreator.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
index 9ba5003..427ebed 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreator.java
@@ -30,7 +30,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
@@ -51,7 +50,7 @@ public final class DataSourcePoolCreator {
     
     /**
      * Create data source.
-     * 
+     *
      * @param dataSourceProps data source properties
      * @return created data source
      */
@@ -106,9 +105,9 @@ public final class DataSourcePoolCreator {
     private static void appendJdbcUrlProperties(final 
CustomDataSourceProperties customDataSourceProps, final DataSource 
targetDataSource, final DataSourcePoolMetaData poolMetaData) {
         String jdbcUrlPropertiesFieldName = 
poolMetaData.getJdbcUrlMetaData().getJdbcUrlPropertiesFieldName();
         if (null != jdbcUrlPropertiesFieldName && 
customDataSourceProps.getProperties().containsKey(jdbcUrlPropertiesFieldName)) {
-            Properties jdbcUrlProps = (Properties) 
customDataSourceProps.getProperties().get(jdbcUrlPropertiesFieldName);
-            for (Entry<Object, Object> entry : jdbcUrlProps.entrySet()) {
-                
poolMetaData.getJdbcUrlMetaData().appendJdbcUrlProperties(entry.getKey().toString(),
 entry.getValue().toString(), targetDataSource);
+            Map<String, Object> jdbcUrlProps = (Map<String, Object>) 
customDataSourceProps.getProperties().get(jdbcUrlPropertiesFieldName);
+            for (Entry<String, Object> entry : jdbcUrlProps.entrySet()) {
+                
poolMetaData.getJdbcUrlMetaData().appendJdbcUrlProperties(entry.getKey(), 
entry.getValue().toString(), targetDataSource);
             }
         }
     }