From 60c672eeea5f7290443b5a48aa357ef4fb8502e3 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 12 Jul 2016 18:59:29 -0700 Subject: [PATCH] GUACAMOLE-5: Ensure all API errors are returned as JSON. --- .../main/java/org/apache/guacamole/rest/APIException.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/APIException.java b/guacamole/src/main/java/org/apache/guacamole/rest/APIException.java index 0a004bef6..ea4cf5d5d 100644 --- a/guacamole/src/main/java/org/apache/guacamole/rest/APIException.java +++ b/guacamole/src/main/java/org/apache/guacamole/rest/APIException.java @@ -21,6 +21,7 @@ package org.apache.guacamole.rest; import java.util.Collection; import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.guacamole.form.Field; import org.apache.guacamole.protocol.GuacamoleStatus; @@ -44,7 +45,10 @@ public class APIException extends WebApplicationException { * The error that occurred. */ public APIException(APIError error) { - super(Response.status(error.getType().getStatus()).entity(error).build()); + super(Response.status(error.getType().getStatus()) + .type(MediaType.APPLICATION_JSON) + .entity(error) + .build()); } /**