From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 1 May 2015 04:03:38 +0000 (-0700)
Subject: CSPACE-6525: Log, and return in response, certain server-side errors when importing.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f3bd0aa5924e793090ed06c6d4a5800bf87c1384;p=tmp%2Fjakarta-migration.git

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 94010f7cf..296e4eb86 100644
--- 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,