From 99793c3ea944bb13c309cba4c6390b57b72142d7 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 6 Nov 2023 17:06:32 -0500 Subject: [PATCH] Fix possible race condition where fileParams becomes null --- .../java/eu/siacs/conversations/entities/Message.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index aedf2f325a3abe56a7b271abc071e8a005827f40..3820d7745d9444dec98d07436b12d6b2695162ac 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -329,16 +329,17 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable } public ContentValues getCheogramContentValues() { + final FileParams fp = fileParams; ContentValues values = new ContentValues(); values.put(UUID, uuid); values.put("subject", subject); - values.put("fileParams", fileParams == null ? null : fileParams.toString()); - if (fileParams != null && !fileParams.isEmpty()) { + values.put("fileParams", fp == null ? null : fp.toString()); + if (fp != null && !fp.isEmpty()) { List sims = getSims(); if (sims.isEmpty()) { - addPayload(fileParams.toSims()); + addPayload(fp.toSims()); } else { - sims.get(0).replaceChildren(fileParams.toSims().getChildren()); + sims.get(0).replaceChildren(fp.toSims().getChildren()); } } values.put("payloads", payloads.size() < 1 ? null : payloads.stream().map(Object::toString).collect(Collectors.joining()));