CSPACE-6525: Log, and return in response, certain server-side errors when importing.

diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
index 94010f7cf30804089551d78e7d074f46738f07c4..296e4eb864ae7ad42bd8e94eb1e9ce9183221745 100644 (file)
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
@@ -203,22 +203,22 @@ public class ImportsResource extends AbstractCollectionSpaceResourceImpl<PoxPayl
        public Response create(@Context UriInfo ui,
                        String xmlPayload) {
                String result = null;
-               ResponseBuilder rb;
+               ResponseBuilder rb = Response.ok();
                try {
-            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(ui);
+                        ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext(ui);
                        int timeout = ctx.getTimeoutSecs(); // gets it from query param 'impTimout' or uses default if no query param specified
                        // InputSource inputSource = payloadToInputSource(xmlPayload);
                        // result = createFromInputSource(inputSource);
                        String inputFilename = payloadToFilename(xmlPayload);
                        result = createFromFilename(inputFilename, timeout);
-                       rb = Response.ok();
                } catch (Exception e) {
-                       result = Tools.errorToString(e, true);
-                       rb = Response
-                                       .status(Response.Status.INTERNAL_SERVER_ERROR);
-               }
-               rb.entity(result);
-               return rb.build();
+                        result = e.getMessage();
+                        logger.error(result);
+                       rb = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+               } finally {
+                    rb.entity(result);
+                    return rb.build();
+                }
        }
 
        public static String createFromInputSource(InputSource inputSource,