transaction closing and cleanup improvement

Evolveum · Dec 12, 2018 · 3d3efd2 · 3d3efd2
1 parent e79339f
commit 3d3efd2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
@@ -102,7 +102,7 @@ public Session beginTransaction(boolean readOnly) {
 			session.setHibernateFlushMode(FlushMode.MANUAL);
 
 			LOGGER.trace("Marking transaction as read only.");
-			session.doWork(connection -> connection.createStatement().execute("SET TRANSACTION READ ONLY"));
+				session.doWork(connection -> connection.createStatement().execute("SET TRANSACTION READ ONLY"));
 		}
 		return session;
 	}
@@ -135,6 +135,10 @@ void rollbackTransaction(Session session, Throwable ex, String message, Operatio
 	}
 
 	public void cleanupSessionAndResult(Session session, OperationResult result) {
+	    if (session != null && session.getTransaction().isActive()) {
+            session.getTransaction().commit();
+        }
+
 		if (session != null && session.isOpen()) {
 			session.close();
 		}