]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-5728: Skip checks for deleted CollectionObject records in the no-context invoc...
authorAron Roberts <aron@socrates.berkeley.edu>
Fri, 11 Jan 2013 20:19:14 +0000 (12:19 -0800)
committerAron Roberts <aron@socrates.berkeley.edu>
Fri, 11 Jan 2013 20:19:14 +0000 (12:19 -0800)
services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/UpdateObjectLocationBatchJob.java

index 8604fb7f02e59e3137df2c7baae9ae975c42e9f1..f29f498384a97be6d0e3d53c1658772a1310cfe3 100644 (file)
@@ -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 =