MID-7101: removed potential for DB connection leak if commit before c…

…lose fails This may or may not fix the issue, but is in line with changes made for 4.4.
Evolveum · Jun 16, 2021 · f247299 · f247299
1 parent 233db62
commit f247299
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java
@@ -80,6 +80,7 @@ public void cleanup() {
             jdbcSession.newDelete(QAuditResourceMapping.INSTANCE.defaultAlias()).execute();
             jdbcSession.newDelete(QAuditRefValueMapping.INSTANCE.defaultAlias()).execute();
             jdbcSession.newDelete(QAuditEventRecordMapping.INSTANCE.defaultAlias()).execute();
+            jdbcSession.commit();
         }
     }
 

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceFactory.java
@@ -149,6 +149,7 @@ private void initCustomColumns(
                         .startTransaction(Connection.TRANSACTION_READ_COMMITTED)) {
                     jdbcSession.addColumn(QAuditEventRecord.TABLE_NAME,
                             ColumnMetadata.named(columnName).ofType(Types.VARCHAR).withSize(255));
+                    jdbcSession.commit();
                 }
             }
         }

diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
@@ -161,6 +161,7 @@ private void auditAttempt(AuditEventRecord record) {
                 insertProperties(jdbcSession, recordId, record.getProperties());
                 insertReferences(jdbcSession, recordId, record.getReferences());
                 insertResourceOids(jdbcSession, recordId, record.getResourceOids());
+                jdbcSession.commit();
             } catch (RuntimeException ex) {
                 jdbcSession.handleGeneralException(ex, null);
             }

diff --git a/repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/JdbcSession.java b/repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/JdbcSession.java
@@ -248,9 +248,6 @@ public SupportedDatabase databaseType() {
     @Override
     public void close() {
         try {
-            if (!connection.getAutoCommit()) {
-                commit();
-            }
             connection.close();
         } catch (SQLException e) {
             throw new SystemException(e);