From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 22 Jun 2011 00:33:00 +0000 (+0000)
Subject: CSPACE-1110: Services layer now returns plain text error messages, rather than JBoss... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=019e7fc0c89f7795b71a0553afb6394054e300a6;p=tmp%2Fjakarta-migration.git

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.
---

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<IT, OT>
             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