From 019e7fc0c89f7795b71a0553afb6394054e300a6 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Wed, 22 Jun 2011 00:33:00 +0000 Subject: [PATCH] CSPACE-1110: Services layer now returns plain text error messages, rather than JBoss-generated HTML error messages, in responses from two additional types of Exceptions. This improves the consistency in the format, if not yet always the content, of services error responses. --- .../common/AbstractCollectionSpaceResourceImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java index a091d7424..cbb61c928 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java +++ b/services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java @@ -403,15 +403,21 @@ public abstract class AbstractCollectionSpaceResourceImpl if (code == 0){ code = Response.Status.BAD_REQUEST.getStatusCode(); } - return new WebApplicationException(e, code); + // CSPACE-1110 + response = Response.status(code).entity(serviceMsg + e.getMessage()).type("text/plain").build(); + // return new WebApplicationException(e, code); + return new WebApplicationException(response); } else if (e instanceof DocumentException){ int code = ((DocumentException) e).getErrorCode(); if (code == 0){ code = Response.Status.BAD_REQUEST.getStatusCode(); } - return new WebApplicationException(e, code); - + // CSPACE-1110 + response = Response.status(code).entity(serviceMsg + e.getMessage()).type("text/plain").build(); + // return new WebApplicationException(e, code); + return new WebApplicationException(response); + } else if (e instanceof WebApplicationException) { // subresource may have already thrown this exception // so just pass it on -- 2.47.3