]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-1110: Services layer now returns plain text error messages, rather than JBoss...
authorAron Roberts <aron@socrates.berkeley.edu>
Wed, 22 Jun 2011 00:33:00 +0000 (00:33 +0000)
committerAron Roberts <aron@socrates.berkeley.edu>
Wed, 22 Jun 2011 00:33:00 +0000 (00:33 +0000)
services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java

index a091d74241db855e4e6ba15957aed0340333347e..cbb61c92801599476933ef0b0dd5fdaf3e6bde53 100644 (file)
@@ -403,15 +403,21 @@ public abstract class AbstractCollectionSpaceResourceImpl<IT, OT>
             if (code == 0){\r
                 code = Response.Status.BAD_REQUEST.getStatusCode();\r
             }\r
-            return new WebApplicationException(e, code);\r
+            // CSPACE-1110\r
+            response = Response.status(code).entity(serviceMsg + e.getMessage()).type("text/plain").build();\r
+            // return new WebApplicationException(e, code);\r
+            return new WebApplicationException(response);\r
 \r
         } else if (e instanceof DocumentException){\r
             int code = ((DocumentException) e).getErrorCode();\r
             if (code == 0){\r
                code = Response.Status.BAD_REQUEST.getStatusCode();\r
             }\r
-            return new WebApplicationException(e, code);\r
-\r
+            // CSPACE-1110\r
+            response = Response.status(code).entity(serviceMsg + e.getMessage()).type("text/plain").build();\r
+            // return new WebApplicationException(e, code);\r
+             return new WebApplicationException(response);\r
+           \r
         } else if (e instanceof WebApplicationException) {\r
             // subresource may have already thrown this exception\r
             // so just pass it on\r