From c7c4f8a1fd329091a09da10cadd1ad5ca24aab60 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Fri, 1 May 2015 17:29:54 -0700 Subject: [PATCH] CSPACE-6610: Provide better error response if import payload can't be parsed due to missing elements, etc. --- .../services/imports/nuxeo/ImportCommand.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java index 1d758ee82..20bf0a45d 100644 --- a/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java +++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java @@ -76,9 +76,12 @@ public class ImportCommand { pipe.setReader(reader); pipe.setWriter(writer); DocumentTranslationMap dtm = pipe.run(); - Map documentRefs = dtm.getDocRefMap(); // FIXME: Should be checking for null here! + if (dtm == null) { + throw new Exception("Could not process import payload. Check XML markup for not-well-formed errors, elements not matching import schema, etc."); + } + Map documentRefs = dtm.getDocRefMap(); if (documentRefs != null && documentRefs.isEmpty()) { - throw new Exception("No valid records found in import payload. Check XML markup for not-well-formed errors, elements not matching import or document-specific schema, etc."); + throw new Exception("No valid records found in import payload. Check XML markup for elements not matching import or document-specific schema, etc."); } dump.append(""); for (Map.Entry entry : documentRefs.entrySet()) { -- 2.47.3