don't NPE on rare race condition while fetching MAM

1 files changed, 9 insertions, 0 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 225d05315..818ac1d65 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -492,6 +492,9 @@ public class Message extends AbstractEntity {
 		Message current = this;
 		while(current.mergeable(current.next())) {
 			current = current.next();
+			if (current == null) {
+				break;
+			}
 			body.append(MERGE_SEPARATOR);
 			body.append(current.getBody().trim());
 		}
@@ -507,6 +510,9 @@ public class Message extends AbstractEntity {
 		Message current = this;
 		while(current.mergeable(current.next())) {
 			current = current.next();
+			if (current == null) {
+				break;
+			}
 			status = current.status;
 		}
 		return status;
@@ -517,6 +523,9 @@ public class Message extends AbstractEntity {
 		Message current = this;
 		while(current.mergeable(current.next())) {
 			current = current.next();
+			if (current == null) {
+				break;
+			}
 			time = current.timeSent;
 		}
 		return time;