merge 55be062da68cd74214e24801adfe86244d608c3e and 79837dd95a90891943659194c43f732a364ad9ff from master to test

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/derms/replica1/CoordinatorClient.java b/src/main/java/derms/replica1/CoordinatorClient.java
index 23b5a01..3793542 100644
--- a/src/main/java/derms/replica1/CoordinatorClient.java
+++ b/src/main/java/derms/replica1/CoordinatorClient.java
@@ -56,13 +56,15 @@ public class CoordinatorClient {
         return Collections.emptyList();

     }

 

-    public void returnResource(String coordinatorID, String resourceID) {

+    public String returnResource(String coordinatorID, String resourceID) {

         try {

             String response = server.returnResource(coordinatorID, resourceID);

             System.out.println(response);

             logOperation("returnResource", coordinatorID, resourceID, response);

+            return response;

         } catch (Exception e) {

             e.printStackTrace();

+            throw new RuntimeException(e);

         }

     }

     public String swapResource(String coordinatorID, String oldResourceID, String oldResourceType, String newResourceID, String newResourceType) {