From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 11 Jan 2013 20:19:14 +0000 (-0800)
Subject: CSPACE-5728: Skip checks for deleted CollectionObject records in the no-context invoc... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=c737654dc840686cf24f70115a01a7f54eba91de;p=tmp%2Fjakarta-migration.git

CSPACE-5728: Skip checks for deleted CollectionObject records in the no-context invocation mode.
---

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 =