Merge pull request #113 from FOCONIS/lock-pstatementcache

rbygrave · web-flow · commit d672910c5736 · 2025-02-28T09:08:43.000+13:00
Pstatementcache must be locked in closeConnectionFully
diff --git a/ebean-datasource/src/main/java/io/ebean/datasource/pool/PooledConnection.java b/ebean-datasource/src/main/java/io/ebean/datasource/pool/PooledConnection.java
@@ -250,6 +250,7 @@ void closeConnectionFully(boolean logErrors) {
         Log.error("Error checking if connection [" + name + "] is closed", ex);
       }
     }
+    lock.lock();
     try {
       for (ExtendedPreparedStatement ps : pstmtCache.values()) {
         ps.closeDestroy();
@@ -258,6 +259,8 @@ void closeConnectionFully(boolean logErrors) {
       if (logErrors) {
         Log.warn("Error when closing connection Statements", ex);
       }
+    } finally {
+      lock.unlock();
     }
     try {
       // DB2 (and some other DBMS) may have uncommitted changes and do not allow close

Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,7 @@ void closeConnectionFully(boolean logErrors) {`
`250`	`250`	`Log.error("Error checking if connection [" + name + "] is closed", ex);`
`251`	`251`	`}`
`252`	`252`	`}`
	`253`	`+ lock.lock();`
`253`	`254`	`try {`
`254`	`255`	`for (ExtendedPreparedStatement ps : pstmtCache.values()) {`
`255`	`256`	`ps.closeDestroy();`
`@@ -258,6 +259,8 @@ void closeConnectionFully(boolean logErrors) {`
`258`	`259`	`if (logErrors) {`
`259`	`260`	`Log.warn("Error when closing connection Statements", ex);`
`260`	`261`	`}`
	`262`	`+ } finally {`
	`263`	`+ lock.unlock();`
`261`	`264`	`}`
`262`	`265`	`try {`
`263`	`266`	`// DB2 (and some other DBMS) may have uncommitted changes and do not allow close`