for #1205, sync data source map for Get connection sync to prevent de…

…ad lock
apache · Sep 19, 2018 · 874e9ab · 874e9ab
1 parent 23db595
commit 874e9ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...ing-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java b/...ing-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java
@@ -117,10 +117,9 @@ public final List<Connection> getConnections(final String dataSourceName, final
         return result;
     }
 
-    @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
-    private synchronized List<Connection> createConnections(final DataSource dataSource, final int connectionSize) throws SQLException {
+    private List<Connection> createConnections(final DataSource dataSource, final int connectionSize) throws SQLException {
         List<Connection> result = new ArrayList<>(connectionSize);
-        synchronized (dataSource) {
+        synchronized (getDataSourceMap()) {
             for (int i = 0; i < connectionSize; i++) {
                 Connection connection = dataSource.getConnection();
                 replayMethodsInvocation(connection);

diff --git a/.../src/main/java/io/shardingsphere/proxy/backend/jdbc/datasource/JDBCBackendDataSource.java b/.../src/main/java/io/shardingsphere/proxy/backend/jdbc/datasource/JDBCBackendDataSource.java
@@ -104,13 +104,11 @@ public Connection getConnection(final String dataSourceName) throws SQLException
      * @return connections
      * @throws SQLException SQL exception
      */
-    @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
     public List<Connection> getConnections(final String dataSourceName, final int connectionSize) throws SQLException {
         List<Connection> result = new ArrayList<>(connectionSize);
-        DataSource dataSource = getDataSourceMap().get(dataSourceName);
-        synchronized (dataSource) {
+        synchronized (getDataSourceMap()) {
             for (int i = 0; i < connectionSize; i++) {
-                result.add(dataSource.getConnection());
+                result.add(getDataSourceMap().get(dataSourceName).getConnection());
             }
         }
         return result;