Fix closing transaction manager (#2753)

finos · Apr 8, 2024 · f4472d4 · f4472d4
1 parent 9bc80ba
commit f4472d4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/.../main/java/org/finos/legend/engine/persistence/components/relational/jdbc/JdbcHelper.java b/.../main/java/org/finos/legend/engine/persistence/components/relational/jdbc/JdbcHelper.java
@@ -129,17 +129,20 @@ public void revertTransaction()
     @Override
     public void closeTransactionManager()
     {
-        try
-        {
-            this.transactionManager.close();
-        }
-        catch (SQLException e)
-        {
-            throw new RuntimeException(e);
-        }
-        finally
+        if (this.transactionManager != null)
         {
-            this.transactionManager = null;
+            try
+            {
+                this.transactionManager.close();
+            }
+            catch (SQLException e)
+            {
+                throw new RuntimeException(e);
+            }
+            finally
+            {
+                this.transactionManager = null;
+            }
         }
     }
 

diff --git a/...rg/finos/legend/engine/persistence/components/relational/jdbc/JdbcTransactionManager.java b/...rg/finos/legend/engine/persistence/components/relational/jdbc/JdbcTransactionManager.java
@@ -40,7 +40,10 @@ public JdbcTransactionManager(Connection connection) throws SQLException
 
     public void close() throws SQLException
     {
-        this.statement.close();
+        if (this.statement != null)
+        {
+            this.statement.close();
+        }
     }
 
     public void beginTransaction() throws SQLException