fix: delete synchronized

why168 · why168 · commit 8b4f303045c0 · 2022-07-14T01:53:12.000+08:00
diff --git a/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java b/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java
@@ -332,7 +332,7 @@ public int getPoolPingConnectionsNotUsedFor() {
    */
   public void forceCloseAll() {
     fairLock.lock();
-    synchronized (state) {
+    try {
       expectedConnectionTypeCode = assembleConnectionTypeCode(dataSource.getUrl(), dataSource.getUsername(), dataSource.getPassword());
       for (int i = state.activeConnections.size(); i > 0; i--) {
         try {
@@ -362,6 +362,10 @@ public void forceCloseAll() {
           // ignore
         }
       }
+    } finally {
+      if (fairLock.isLocked()) {
+        fairLock.unlock();
+      }
     }
     if (log.isDebugEnabled()) {
       log.debug("PooledDataSource forcefully closed/removed all connections.");

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public int getPoolPingConnectionsNotUsedFor() {`
`332`	`332`	`*/`
`333`	`333`	`public void forceCloseAll() {`
`334`	`334`	`fairLock.lock();`
`335`		`- synchronized (state) {`
	`335`	`+ try {`
`336`	`336`	`expectedConnectionTypeCode = assembleConnectionTypeCode(dataSource.getUrl(), dataSource.getUsername(), dataSource.getPassword());`
`337`	`337`	`for (int i = state.activeConnections.size(); i > 0; i--) {`
`338`	`338`	`try {`
`@@ -362,6 +362,10 @@ public void forceCloseAll() {`
`362`	`362`	`// ignore`
`363`	`363`	`}`
`364`	`364`	`}`
	`365`	`+ } finally {`
	`366`	`+ if (fairLock.isLocked()) {`
	`367`	`+ fairLock.unlock();`
	`368`	`+ }`
`365`	`369`	`}`
`366`	`370`	`if (log.isDebugEnabled()) {`
`367`	`371`	`log.debug("PooledDataSource forcefully closed/removed all connections.");`