From 677a18761853b93e4d9bca4560ff048d016d46f1 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@googlemail.com>
Date: Thu, 26 Jan 2023 19:17:20 +0100
Subject: [PATCH] Changed transaction handling for importing entities.

---
 .../org/libreccm/imexport/AbstractEntityImExporter.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java b/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
index 8b8527a8e..99ff678fe 100644
--- a/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
+++ b/ccm-core/src/main/java/org/libreccm/imexport/AbstractEntityImExporter.java
@@ -152,7 +152,7 @@ public abstract class AbstractEntityImExporter<T extends Exportable> {
      * @see #updateExistingEntity(org.libreccm.imexport.Exportable,
      * org.libreccm.imexport.Exportable)
      */
-    @Transactional(Transactional.TxType.REQUIRES_NEW)
+    @Transactional(Transactional.TxType.REQUIRED)
     public T importEntity(final String data) throws ImportExpection {
         try {
             final T importedEntity = objectMapper.readValue(data,
@@ -164,10 +164,12 @@ public abstract class AbstractEntityImExporter<T extends Exportable> {
                 final T existingEntity = existingEntityResult.get();
                 updateExistingEntity(existingEntity, importedEntity);
                 
-                
+                entityManager.flush();
                 return existingEntity;
             } else {
                 saveImportedEntity(importedEntity);
+                
+                entityManager.flush();
                 return importedEntity;
             }
         } catch (IOException ex) {