From fd8e8d147545eddc44e8067b389027a68428676d Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 16 Apr 2015 11:33:16 -0700 Subject: [PATCH] Catch WebApplicationException inside WebsocketConnection. // FREEBIE --- .../textsecuregcm/websocket/WebSocketConnection.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java b/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java index 457582507..2cc81ff30 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java +++ b/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java @@ -25,6 +25,7 @@ import org.whispersystems.websocket.messages.WebSocketResponseMessage; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import javax.ws.rs.WebApplicationException; import java.io.IOException; import java.util.List; @@ -136,7 +137,7 @@ public class WebSocketConnection implements DispatchChannel { receiptSender.sendReceipt(account, message.getSource(), message.getTimestamp(), message.hasRelay() ? Optional.of(message.getRelay()) : Optional.absent()); - } catch (IOException | NoSuchUserException | TransientPushFailureException | NotPushRegisteredException e) { + } catch (IOException | NoSuchUserException | TransientPushFailureException | NotPushRegisteredException | WebApplicationException e) { logger.warn("sendDeliveryReceiptFor", e); } }