Use Mono.share() for mrmMessageMono

signalapp · Sep 26, 2024 · ab2e6bb · ab2e6bb
1 parent 513f193
commit ab2e6bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
@@ -444,7 +444,7 @@ private Mono<?> maybeRunMrmViewExperiment(final MessageProtos.Envelope mrmMessag
               conn -> conn.reactive().hmget(key, "data".getBytes(StandardCharsets.UTF_8), sharedMrmViewKey)
                   .collectList()
                   .publishOn(messageDeliveryScheduler)))
-          .handle((mrmDataAndView, sink) -> {
+          .<MessageProtos.Envelope>handle((mrmDataAndView, sink) -> {
             try {
               assert mrmDataAndView.size() == 2;
 
@@ -461,7 +461,8 @@ private Mono<?> maybeRunMrmViewExperiment(final MessageProtos.Envelope mrmMessag
             } catch (Exception e) {
               sink.error(e);
             }
-          });
+          })
+          .share();
 
       experiment.compareMonoResult(mrmMessage.toBuilder().clearSharedMrmKey().build(), mrmMessageMono);
 

diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java
@@ -575,7 +575,7 @@ void testMultiRecipientMessage(final boolean sharedMrmKeyPresent) throws Excepti
       if (sharedMrmKeyPresent) {
         sharedMrmDataKey = messagesCache.insertSharedMultiRecipientMessagePayload(mrm);
       } else {
-        sharedMrmDataKey = new byte[]{1};
+        sharedMrmDataKey = "{1}".getBytes(StandardCharsets.UTF_8);
       }
 
       final UUID guid = UUID.randomUUID();