JDBC-470 Fix thread safety issue that can also cause exception of JDB…

…C-464
cyb3rjy0t · Dec 31, 2016 · 6ae0926 · 6ae0926
1 parent cef3c5c
commit 6ae0926
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/main/org/firebirdsql/gds/impl/GDSHelper.java b/src/main/org/firebirdsql/gds/impl/GDSHelper.java
@@ -105,7 +105,9 @@ public FbStatement allocateStatement() throws SQLException {
      * transaction, <code>false</code> otherwise.
      */
     public boolean inTransaction() {
-        return transaction != null && transaction.getState() == TransactionState.ACTIVE;
+        synchronized (getSynchronizationObject()) {
+            return transaction != null && transaction.getState() == TransactionState.ACTIVE;
+        }
     }
 
     /**

diff --git a/src/main/org/firebirdsql/jdbc/AbstractPreparedStatement.java b/src/main/org/firebirdsql/jdbc/AbstractPreparedStatement.java
@@ -140,14 +140,16 @@ protected AbstractPreparedStatement(GDSHelper c, String sql, int rsType,
         this.metaDataQuery = metaDataQuery;
         this.standaloneStatement = standaloneStatement;
         this.generatedKeys = generatedKeys;
-
-        try {
-            // TODO See http://tracker.firebirdsql.org/browse/JDBC-352
-            notifyStatementStarted();
-            prepareFixedStatement(sql);
-        } catch (SQLException | RuntimeException e) {
-            notifyStatementCompleted(false);
-            throw e;
+
+        synchronized (c.getSynchronizationObject()) {
+            try {
+                // TODO See http://tracker.firebirdsql.org/browse/JDBC-352
+                notifyStatementStarted();
+                prepareFixedStatement(sql);
+            } catch (SQLException | RuntimeException e) {
+                notifyStatementCompleted(false);
+                throw e;
+            }
         }
     }