From c47141ffda5bdcfc26b584d47123f3a053267556 Mon Sep 17 00:00:00 2001
From: Jonathan Klabunde Tomer <125505367+jkt-signal@users.noreply.github.com>
Date: Thu, 19 Sep 2024 15:36:52 -0400
Subject: [PATCH] yield json errors from 500s in sendMultiRecipientMessage

---
 .../textsecuregcm/controllers/MessageController.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
index 9b161c81f..56332f5f8 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
@@ -55,6 +55,7 @@ import javax.ws.rs.DELETE;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
+import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.NotAuthorizedException;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.POST;
@@ -697,13 +698,13 @@ public class MessageController {
           .get();
     } catch (InterruptedException e) {
       logger.error("interrupted while delivering multi-recipient messages", e);
-      return Response.serverError().entity("interrupted during delivery").build();
+      throw new InternalServerErrorException("interrupted during delivery");
     } catch (CancellationException e) {
       logger.error("cancelled while delivering multi-recipient messages", e);
-      return Response.serverError().entity("delivery cancelled").build();
+      throw new InternalServerErrorException("delivery cancelled");
     } catch (ExecutionException e) {
       logger.error("partial failure while delivering multi-recipient messages", e.getCause());
-      return Response.serverError().entity("failure during delivery").build();
+      throw new InternalServerErrorException("failure during delivery");
     }
     return Response.ok(new SendMultiRecipientMessageResponse(Collections.emptyList())).build();
   }