replica2: CoordinatorID default constructor

4 files changed, 7 insertions, 3 deletions

diff --git a/src/main/java/derms/replica2/CoordinatorID.java b/src/main/java/derms/replica2/CoordinatorID.java
index 523ebcf..5ec65de 100644
--- a/src/main/java/derms/replica2/CoordinatorID.java
+++ b/src/main/java/derms/replica2/CoordinatorID.java
@@ -11,6 +11,10 @@ class CoordinatorID implements Serializable {
     this.num = num;
   }
 
+  CoordinatorID() {
+    this("XXX", (short) 0);
+  }
+
   static CoordinatorID parse(String str) throws IllegalArgumentException {
     if (str.length() != City.codeLen+ID.nDigits)
       throw new IllegalArgumentException("illegal coordinator ID: " + str);
diff --git a/src/main/java/derms/replica2/Resource.java b/src/main/java/derms/replica2/Resource.java
index 404cfb0..31d40bc 100644
--- a/src/main/java/derms/replica2/Resource.java
+++ b/src/main/java/derms/replica2/Resource.java
@@ -20,7 +20,7 @@ class Resource implements Serializable {
   }
 
   Resource(ResourceID id, ResourceType type, int duration) {
-    this(id, type, duration, false, new CoordinatorID("XXX", (short) 1), -1);
+    this(id, type, duration, false, new CoordinatorID(), -1);
   }
 
   Resource() {
diff --git a/src/main/java/derms/replica2/ReturnResource.java b/src/main/java/derms/replica2/ReturnResource.java
index 6adac50..6c42b8a 100644
--- a/src/main/java/derms/replica2/ReturnResource.java
+++ b/src/main/java/derms/replica2/ReturnResource.java
@@ -169,7 +169,7 @@ class ReturnResource {
 								request.resourceID+" is not borrowed by "+request.coordinatorID);
 					}
 					resource.isBorrowed = false;
-					resource.borrower = request.coordinatorID;
+					resource.borrower = new CoordinatorID();
 					resource.borrowDuration = -1;
 					return new Response(Response.Status.SUCCESS, request.coordinatorID+" successfully returned "+resource.id);
 				}
diff --git a/src/main/java/derms/replica2/SwapResource.java b/src/main/java/derms/replica2/SwapResource.java
index fbd2cf9..cc65f29 100644
--- a/src/main/java/derms/replica2/SwapResource.java
+++ b/src/main/java/derms/replica2/SwapResource.java
@@ -219,7 +219,7 @@ class SwapResource {
 
 		private void returnOldResource(Resource r) {
 			r.isBorrowed = false;
-			r.borrower = request.cid;
+			r.borrower = new CoordinatorID();
 			r.borrowDuration = -1;
 		}
 	}