DRYD-839: Fix exception when finding an authority item by csid without knowing the...

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 625476517ca75dc0cf85453fd0c3af30324dc5d3..3762dfa4704077f31e28c799a3d9b9296ad1aa12 100644 (file)
--- 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;