From 252f045805fdced95de94e9b867a7fad06c37c2d Mon Sep 17 00:00:00 2001 From: Ray Lee Date: Wed, 11 Mar 2020 00:32:39 -0700 Subject: [PATCH] DRYD-839: Fix exception when finding an authority item by csid without knowing the parent. --- .../services/batch/nuxeo/AbstractBatchJob.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/AbstractBatchJob.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/AbstractBatchJob.java index 625476517..3762dfa47 100644 --- a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/AbstractBatchJob.java +++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/AbstractBatchJob.java @@ -28,6 +28,7 @@ import org.collectionspace.services.client.RelationClient; import org.collectionspace.services.client.TaxonomyAuthorityClient; import org.collectionspace.services.client.workflow.WorkflowClient; import org.collectionspace.services.collectionobject.nuxeo.CollectionObjectConstants; +import org.collectionspace.services.common.CSWebApplicationException; import org.collectionspace.services.common.CollectionSpaceResource; import org.collectionspace.services.common.NuxeoBasedResource; import org.collectionspace.services.common.ServiceMain; @@ -330,8 +331,11 @@ public abstract class AbstractBatchJob extends AbstractBatchInvocable { for (String vocabularyCsid : vocabularyCsids) { logger.debug("vocabularyCsid=" + vocabularyCsid); - // FIXME: This throws DocumentNotFoundException, so will never go to the next vocabulary - itemPayload = findAuthorityItemByCsid(serviceName, vocabularyCsid, csid); + try { + itemPayload = findAuthorityItemByCsid(serviceName, vocabularyCsid, csid); + } catch (CSWebApplicationException e) { + itemPayload = null; + } if (itemPayload != null) { break; -- 2.47.3