acquire lock before checking message listeners in MessagesCache

signalapp · Jul 26, 2023 · baf98ac · baf98ac
1 parent 901c950
commit baf98ac
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
@@ -388,7 +388,10 @@ public void addMessageAvailabilityListener(final UUID destinationUuid, final lon
   }
 
   public void removeMessageAvailabilityListener(final MessageAvailabilityListener listener) {
-    @Nullable final String queueName = queueNamesByMessageListener.get(listener);
+    @Nullable final String queueName;
+    synchronized (messageListenersByQueueName) {
+      queueName = queueNamesByMessageListener.get(listener);
+    }
 
     if (queueName != null) {
       unsubscribeFromKeyspaceNotifications(queueName);