don't NPE on rare race condition while fetching MAM

Daniel Gultsch created 9 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Message.java | 9 ++++++++
1 file changed, 9 insertions(+)

Detailed changes

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;