From 129e7ec7f59ba1c62cf84a443e13556a5372a6ed Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 21 May 2014 09:39:54 +0200
Subject: [PATCH] OO-1097: if the E-Mail to delete is null, nothing to delete
---
.../java/org/olat/core/util/mail/manager/MailManagerImpl.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java b/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
index 1c255d0096b..b90b058a2ca 100644
--- a/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
+++ b/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
@@ -426,6 +426,7 @@ public class MailManagerImpl extends BasicManager implements MailManager {
*/
@Override
public void delete(DBMailLight mail, Identity identity, boolean deleteMetaMail) {
+ if(mail == null) return;//already deleted
if(StringHelper.containsNonWhitespace(mail.getMetaId()) && deleteMetaMail) {
List<DBMailLight> mails = getEmailsByMetaId(mail.getMetaId());
for(DBMailLight childMail:mails) {
--
GitLab