From fb33c8da618504a5d1d5eae9d8ffdfa5516ca4ed Mon Sep 17 00:00:00 2001
From: Daniel Bernstein <dabylon@gmail.com>
Date: Fri, 1 Mar 2024 14:44:58 -0800
Subject: [PATCH] Fix test.

---
 .../snapshot/service/impl/RestoreManagerImpl.java        | 9 ++++-----
 .../snapshot/service/impl/RestoreManagerImplTest.java    | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/snapshot-service-impl/src/main/java/org/duracloud/snapshot/service/impl/RestoreManagerImpl.java b/snapshot-service-impl/src/main/java/org/duracloud/snapshot/service/impl/RestoreManagerImpl.java
index 74bed5d..70612b8 100644
--- a/snapshot-service-impl/src/main/java/org/duracloud/snapshot/service/impl/RestoreManagerImpl.java
+++ b/snapshot-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/snapshot-service-impl/src/test/java/org/duracloud/snapshot/service/impl/RestoreManagerImplTest.java b/snapshot-service-impl/src/test/java/org/duracloud/snapshot/service/impl/RestoreManagerImplTest.java
index 58fe74e..1cabd39 100644
--- a/snapshot-service-impl/src/test/java/org/duracloud/snapshot/service/impl/RestoreManagerImplTest.java
+++ b/snapshot-service-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());