Fix potential overflow in AdminClient.waitForCompletion

kthawan · Jun 20, 2013 · 2bf1543 · 2bf1543
1 parent 81f0a16
commit 2bf1543
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/java/voldemort/client/protocol/admin/AdminClient.java b/src/java/voldemort/client/protocol/admin/AdminClient.java
@@ -782,7 +782,7 @@ public String waitForCompletion(int nodeId, int requestId) {
          * @param key metadata key to keep checking for current value
          * @param value metadata value should match for exit criteria.
          * @param maxWait Maximum time we'll keep checking a request until we
-         *        give up
+         *        give up. Pass in 0 or less to wait "forever".
          * @param timeUnit Unit in which maxWait is expressed.
          */
         public void waitForCompletion(int nodeId,
@@ -791,7 +791,10 @@ public void waitForCompletion(int nodeId,
                                       long maxWait,
                                       TimeUnit timeUnit) {
             long delay = INITIAL_DELAY;
-            long waitUntil = System.currentTimeMillis() + timeUnit.toMillis(maxWait);
+            long waitUntil = Long.MAX_VALUE;
+            if(maxWait > 0) {
+                waitUntil = System.currentTimeMillis() + timeUnit.toMillis(maxWait);
+            }
 
             while(System.currentTimeMillis() < waitUntil) {
                 String currentValue = metadataMgmtOps.getRemoteMetadata(nodeId, key).getValue();
@@ -827,7 +830,7 @@ public void waitForCompletion(int nodeId,
          * @param value metadata value should match for exit criteria.
          */
         public void waitForCompletion(int nodeId, String key, String value) {
-            waitForCompletion(nodeId, key, value, Long.MAX_VALUE, TimeUnit.SECONDS);
+            waitForCompletion(nodeId, key, value, 0, TimeUnit.SECONDS);
         }
 
     }