[shardingsphere] branch master updated: Fix MySQL IT error (#14800)

[wuweijie]

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

wuweijie 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 c840613  Fix MySQL IT error (#14800)
c840613 is described below

commit c8406139a7d8520290c4f37c5332fd7f5d436363
Author: Liang Zhang <terrym...@163.com>
AuthorDate: Sun Jan 16 00:39:14 2022 +0800

    Fix MySQL IT error (#14800)
---
 .../infra/config/datasource/pool/creator/DataSourcePoolCreator.java     | 2 +-
 .../infra/config/datasource/props/DataSourcePropertiesCreator.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
index 0c43fc8..0435631 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/pool/creator/DataSourcePoolCreator.java
@@ -43,7 +43,7 @@ public final class DataSourcePoolCreator {
      * @return created data sources
      */
     public static Map<String, DataSource> create(final Map<String, 
DataSourceProperties> dataSourcePropsMap) {
-        return 
dataSourcePropsMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey, 
entry -> create(entry.getValue()), (a, b) -> b, LinkedHashMap::new));
+        return 
dataSourcePropsMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey, 
entry -> create(entry.getValue()), (oldValue, currentValue) -> oldValue, 
LinkedHashMap::new));
     }
     
     /**
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/props/DataSourcePropertiesCreator.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/props/DataSourcePropertiesCreator.java
index c328178..c1d93a9 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/props/DataSourcePropertiesCreator.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/props/DataSourcePropertiesCreator.java
@@ -42,7 +42,7 @@ public final class DataSourcePropertiesCreator {
      * @return created data source properties
      */
     public static Map<String, DataSourceProperties> create(final Map<String, 
DataSource> dataSourceMap) {
-        return 
dataSourceMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey, entry 
-> create(entry.getValue()), (a, b) -> b, LinkedHashMap::new));
+        return 
dataSourceMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey, entry 
-> create(entry.getValue()), (oldValue, currentValue) -> oldValue, 
LinkedHashMap::new));
     }
     
     /**