Correct stale Storage IDs of Studies on deletion fix #1722

dcm4che · Dec 5, 2018 · 570a0ea · 570a0ea
1 parent 447161d
commit 570a0ea
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/dcm4chee-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/DeletionServiceEJB.java b/dcm4chee-arc-delete/src/main/java/org/dcm4chee/arc/delete/impl/DeletionServiceEJB.java
@@ -259,6 +259,7 @@ public boolean deleteObjectsOfStudy(Long studyPk, StorageDescriptor desc) {
                 .getResultList();
         if (locations.isEmpty()) {
             LOG.warn("{} does not contain objects at Storage{}", study, storageIDs);
+            updateStorageIDs(study, storageIDs);
             return false;
         }
         LOG.debug("Start marking {} objects of {} for deletion at Storage{}", locations.size(), study, storageIDs);
@@ -273,12 +274,16 @@ public boolean deleteObjectsOfStudy(Long studyPk, StorageDescriptor desc) {
                     && series.getMetadata() != null)
                 scheduleMetadataUpdate(series.getPk());
         }
+        updateStorageIDs(study, storageIDs);
+        return true;
+    }
+
+    private void updateStorageIDs(Study study, List<String> storageIDs) {
         String studyEncodedStorageIDs = study.getEncodedStorageIDs();
         for (String storageID : storageIDs) {
             study.removeStorageID(storageID);
         }
         LOG.info("Update Storage IDs of {} from {} to {}", study, studyEncodedStorageIDs, study.getEncodedStorageIDs());
-        return true;
     }
 
     public int deleteRejectedInstancesOrRejectionNotesBefore(