Fixing db pool connection deadlock caused by nested SqlService #19

txstate-etc · Apr 17, 2020 · 568ada7 · 568ada7
1 parent a54b01c
commit 568ada7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/db/impl/BasicSqlService.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/db/impl/BasicSqlService.java
@@ -538,6 +538,7 @@ public List dbRead(Connection callerConn, String sql, Object[] fields, SqlReader
                 conn = callerConn;
             } else {
                 conn = borrowConnection();
+                threadLocalManager().set(TRANSACTION_CONNECTION, conn);
             }
             if (m_showSql) {
                 connectionTime = System.currentTimeMillis() - start;
@@ -616,6 +617,7 @@ public List dbRead(Connection callerConn, String sql, Object[] fields, SqlReader
                             LOG.warn("Sql.dbRead: sql: " + sql + debugFields(fields), e);
                         }
                     }
+                    threadLocalManager().set(TRANSACTION_CONNECTION, null);
                     returnConnection(conn);
                 }
             }