From 0370306bb6c4526e7051e058ebb1bcfd095ac61b Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Sat, 1 Aug 2015 10:09:15 -0700 Subject: [PATCH] Map 411 to 413 // FREEBIE --- .../textsecuregcm/federation/FederatedClient.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java b/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java index f826ffa3a..f759b69bb 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java +++ b/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java @@ -17,7 +17,6 @@ package org.whispersystems.textsecuregcm.federation; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; @@ -43,7 +42,6 @@ import javax.net.ssl.TrustManagerFactory; import javax.ws.rs.ProcessingException; import javax.ws.rs.WebApplicationException; import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Entity; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -180,7 +178,8 @@ public class FederatedClient { .put(Entity.json(messages)); if (response.getStatus() != 200 && response.getStatus() != 204) { - throw new WebApplicationException(Response.status(response.getStatusInfo()).build()); + if (response.getStatus() == 411) throw new WebApplicationException(Response.status(413).build()); + else throw new WebApplicationException(Response.status(response.getStatusInfo()).build()); } } catch (ProcessingException e) { @@ -204,7 +203,8 @@ public class FederatedClient { .put(Entity.entity("", MediaType.APPLICATION_JSON_TYPE)); if (response.getStatus() != 200 && response.getStatus() != 204) { - throw new WebApplicationException(Response.status(response.getStatusInfo()).build()); + if (response.getStatus() == 411) throw new WebApplicationException(Response.status(413).build()); + else throw new WebApplicationException(Response.status(response.getStatusInfo()).build()); } } catch (ProcessingException e) { logger.warn("sendMessage", e);