From c737654dc840686cf24f70115a01a7f54eba91de Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Fri, 11 Jan 2013 12:19:14 -0800 Subject: [PATCH] CSPACE-5728: Skip checks for deleted CollectionObject records in the no-context invocation mode. --- .../batch/nuxeo/UpdateObjectLocationBatchJob.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java index 8604fb7f0..f29f49838 100644 --- a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java +++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java @@ -133,11 +133,15 @@ public class UpdateObjectLocationBatchJob extends AbstractBatchInvocable { for (String collectionObjectCsid : csids) { // Skip over soft-deleted CollectionObject records - if (isRecordDeleted(collectionObjectResource, collectionObjectCsid)) { - if (logger.isTraceEnabled()) { - logger.trace("Skipping soft-deleted CollectionObject record with CSID " + collectionObjectCsid); + // + // (No context invocations already have filtered out those records) + if (!requestIsForInvocationModeNoContext()) { + if (isRecordDeleted(collectionObjectResource, collectionObjectCsid)) { + if (logger.isTraceEnabled()) { + logger.trace("Skipping soft-deleted CollectionObject record with CSID " + collectionObjectCsid); + } + continue; } - continue; } // Get the Movement records related to this CollectionObject record AbstractCommonList relatedMovements = -- 2.47.3