From e249551dec15a2cd088b8b9a7aaaf41daa15b717 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 11 Jan 2021 08:31:27 +0100
Subject: [PATCH] OO-5196: reload before removing top messages of forums
---
.../java/org/olat/modules/fo/manager/ForumManager.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/modules/fo/manager/ForumManager.java b/src/main/java/org/olat/modules/fo/manager/ForumManager.java
index 9feeb02040c..5a4700263bb 100644
--- a/src/main/java/org/olat/modules/fo/manager/ForumManager.java
+++ b/src/main/java/org/olat/modules/fo/manager/ForumManager.java
@@ -772,7 +772,12 @@ public class ForumManager {
.getResultList();
for(Message threadToDelete:threadsToDelete) {
deleteMessageTree(forumKey, threadToDelete);
- dbInstance.getCurrentEntityManager().remove(threadToDelete);
+
+ Message reloadedMessage = dbInstance.getCurrentEntityManager()
+ .find(MessageImpl.class, threadToDelete.getKey());
+ if(reloadedMessage != null) {
+ dbInstance.getCurrentEntityManager().remove(threadToDelete);
+ }
}
dbInstance.commit();
--
GitLab