fix(ArchivalInfoPackageRemoteResourceService): check if preferredStorage is null

DLCM-ResourceServerCommon/src/main/java/ch/dlcm/service/rest/abstractservice/ArchivalInfoPackageRemoteResourceService.java

@@ -268,17 +268,18 @@ public abstract class ArchivalInfoPackageRemoteResourceService extends RemoteRes
   }
 
   public String findStorageForAIP(String aipId, Integer preferredStorage) {
-    if (preferredStorage != null) {
-      for (String storage : this.getArchivalStorageListByPreference(preferredStorage)) {
-        if (this.isAipPresent(storage, aipId)) {
-          return storage;
-        }
+    for (String storage : this.getArchivalStorageListByPreference(preferredStorage)) {
+      if (this.isAipPresent(storage, aipId)) {
+        return storage;
       }
     }
     return this.getDefaultArchivalStorage();
   }
 
   public String[] getArchivalStorageListByPreference(Integer preferredStorageIndex) {
+    if (preferredStorageIndex == null) {
+      return this.archivalStorageList;
+    }
     List<String> list = new ArrayList<>(Arrays.asList(this.archivalStorageList));
     String preferredStorage = list.remove(preferredStorageIndex.intValue());
     list.add(0, preferredStorage);