qadevOOo/runner/convwatch/DBHelper.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 0c5327423829905ce1d7950fd3f749f8a6300f1a
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jan 2 19:42:57 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Jan 3 22:12:19 2024 +0100
cid#1545822 SSD: Do not use an instance lock to protect shared static data
Change-Id: I269e4cd52673ebe7c3e30670b2dfe29acbd48af3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161548
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/qadevOOo/runner/convwatch/DBHelper.java
b/qadevOOo/runner/convwatch/DBHelper.java
index 34e1e1cfdeee..9bcf4765350e 100644
--- a/qadevOOo/runner/convwatch/DBHelper.java
+++ b/qadevOOo/runner/convwatch/DBHelper.java
@@ -109,12 +109,15 @@ public class DBHelper
ExecSQL( _aCon, aUpdateStr.toString() );
}
+ private static final Object settingsLock = new Object();
private static String m_sDBServerName;
private static String m_sDBName;
private static String m_sDBUser;
private static String m_sDBPasswd;
- protected synchronized void fillDBConnection(String _sInfo)
+ protected void fillDBConnection(String _sInfo)
+ {
+ synchronized (settingsLock)
{
StringTokenizer aTokenizer = new StringTokenizer(_sInfo,",",false);
while (aTokenizer.hasMoreTokens())
@@ -138,6 +141,7 @@ public class DBHelper
}
}
}
+ }
/**
* This method establishes a Connection<br>
@@ -145,6 +149,8 @@ public class DBHelper
*/
public static Connection getMySQLConnection() throws SQLException
+ {
+ synchronized (settingsLock)
{
try
{
@@ -162,6 +168,7 @@ public class DBHelper
}
return null;
}
+ }
private synchronized void ExecSQL(Connection _aCon, String _sSQL)
{
