Fix test.

duracloud · Mar 1, 2024 · fb33c8d · fb33c8d
1 parent 66316b1
commit fb33c8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...ot-service-impl/src/main/java/org/duracloud/snapshot/service/impl/RestoreManagerImpl.java b/...ot-service-impl/src/main/java/org/duracloud/snapshot/service/impl/RestoreManagerImpl.java
@@ -489,20 +489,19 @@ public void finalizeRestores() {
                 try {
                     String spaceId = destination.getSpaceId();
                     boolean spaceExists = store.spaceExists(spaceId);
-                    boolean spaceEmpty = false;
-
+
                     if(spaceExists) {
                         Iterator<String> it = store.getSpaceContents(spaceId);
-                        spaceEmpty = !it.hasNext();
-                        if (spaceEmpty) { // if space is empty
+                        if (!it.hasNext()) { // if space is empty
                             // Call DuraCloud to remove space
                             log.info("Deleting expired restoration space: " + spaceId +
                                     " at host: " + destination.getHost());
                             store.deleteSpace(spaceId);
+                            spaceExists = false;
                         }
                     }
 
-                    if (!spaceExists || spaceEmpty){
+                    if (!spaceExists){
                         // Update restore status
                         validateAndSet(restoration,
                                 RestoreStatus.RESTORATION_EXPIRED,

diff --git a/...ervice-impl/src/test/java/org/duracloud/snapshot/service/impl/RestoreManagerImplTest.java b/...ervice-impl/src/test/java/org/duracloud/snapshot/service/impl/RestoreManagerImplTest.java
@@ -308,6 +308,7 @@ public void testFinalizeRestores() throws Exception {
 
         expect(destination.getSpaceId()).andReturn(spaceId);
         expect(destination.getHost()).andReturn(host);
+        expect(contentStore.spaceExists(spaceId)).andReturn(true);
         expect(contentStore.getSpaceContents(spaceId))
             .andReturn(Collections.<String>emptyList().iterator());