From 4316a99baabb7f49cc0a84ba07448dd98a046208 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Wed, 29 Jan 2025 16:51:56 +0100
Subject: [PATCH] OZG-4094 Fix NPE for empty messages
---
.../postfach/osiv2/transfer/PostfachApiFacadeService.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeService.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeService.java
index 7d3651a..b2b1499 100644
--- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeService.java
+++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/transfer/PostfachApiFacadeService.java
@@ -1,5 +1,7 @@
package de.ozgcloud.nachrichten.postfach.osiv2.transfer;
+import java.util.Collection;
+import java.util.Optional;
import java.util.UUID;
import java.util.stream.Stream;
@@ -34,7 +36,10 @@ public class PostfachApiFacadeService {
public Stream<PostfachNachricht> receiveMessages() {
var response = messageExchangeApi.receiveMessages(MAX_NUMBER_RECEIVED_MESSAGES, 0);
- return response.getMessages().stream().map(this::fetchMessageByGuid);
+ return Optional.ofNullable(response.getMessages())
+ .stream()
+ .flatMap(Collection::stream)
+ .map(this::fetchMessageByGuid);
}
PostfachNachricht fetchMessageByGuid(final MessageExchangeReceiveMessage message) {
--
GitLab