XWIKI-12179: MailSenderScriptService will throw a nullpointerexceptio…

…n if there is any issue instead of returning null * Bulletproof the API by checking if the result is null before using it
xwiki · Feb 8, 2024 · 07efa15 · 07efa15
1 parent 6872d3e
commit 07efa15
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...atform-mail-send-default/src/main/java/org/xwiki/mail/script/MailSenderScriptService.java b/...atform-mail-send-default/src/main/java/org/xwiki/mail/script/MailSenderScriptService.java
@@ -236,8 +236,10 @@ public ScriptMailResult send(Iterable<? extends MimeMessage> messages, String hi
     {
         ScriptMailResult scriptMailResult = sendAsynchronously(messages, hint);
 
-        // Wait for all messages from this batch to have been sent before returning
-        scriptMailResult.getStatusResult().waitTillProcessed(Long.MAX_VALUE);
+        if (scriptMailResult != null) {
+            // Wait for all messages from this batch to have been sent before returning
+            scriptMailResult.getStatusResult().waitTillProcessed(Long.MAX_VALUE);
+        }
 
         return scriptMailResult;
     }