Merge branch 'master' of github.com:dcm4che/dcm4chee-arc-light

dcm4che · Jun 5, 2023 · ef1a87f · ef1a87f
2 parents e7cc318 + 03466f3
commit ef1a87f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/dcm4chee-arc-conf/src/main/java/org/dcm4chee/arc/conf/ArchiveDeviceExtension.java b/dcm4chee-arc-conf/src/main/java/org/dcm4chee/arc/conf/ArchiveDeviceExtension.java
@@ -1920,15 +1920,15 @@ private List<StorageDescriptor> getStorageDescriptors(String[] storageIDs, boole
         return list;
     }
 
-    public Stream<String> getStorageIDsOfCluster(String clusterID) {
+    public Stream<StorageDescriptor> getStorageDescriptorsOfCluster(String clusterID) {
         return storageDescriptorMap.values().stream()
-                .filter(desc -> clusterID.equals(desc.getStorageClusterID()))
-                .map(StorageDescriptor::getStorageID);
+                .filter(desc -> clusterID.equals(desc.getStorageClusterID()));
     }
 
     public List<String> getOtherStorageIDsOfStorageCluster(StorageDescriptor desc) {
         return desc.getStorageClusterID() != null
-                ? getStorageIDsOfCluster(desc.getStorageClusterID())
+                ? getStorageDescriptorsOfCluster(desc.getStorageClusterID())
+                    .map(StorageDescriptor::getStorageID)
                     .filter(storageID -> !storageID.equals(desc.getStorageID()))
                     .collect(Collectors.toList())
                 : Collections.emptyList();

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
@@ -667,7 +667,9 @@ public void updateStudyAccessTime(Long studyPk) {
     private List<String> getStorageIDsOfCluster(StorageDescriptor desc) {
         return desc.getStorageClusterID() != null
             ? device.getDeviceExtensionNotNull(ArchiveDeviceExtension.class)
-                .getStorageIDsOfCluster(desc.getStorageClusterID())
+                .getStorageDescriptorsOfCluster(desc.getStorageClusterID())
+                .filter(other -> other.getStorageDuration() != StorageDuration.PERMANENT)
+                .map(StorageDescriptor::getStorageID)
                 .filter(storageID -> !Arrays.asList(desc.getExportStorageID()).contains(storageID))
                 .collect(Collectors.toList())
             : Collections.singletonList(desc.getStorageID());