commit 477cb13e50760d8fe0044cb003a96ee4f75afde7
author randgalt <randgalt@apache.org> Sun Jul 07 10:55:41 2013 -0700
committer randgalt <randgalt@apache.org> Sun Jul 07 10:55:41 2013 -0700
tree a851de6acf6522668f0e95639caa103d015cfa1b
parent c8942b13030f3bc33567b02268e6f9304499460e

Make sure system prop timing-waiting-multiple is always used

curator-test/src/main/java/org/apache/curator/test/Timing.java

diff --git a/curator-test/src/main/java/org/apache/curator/test/Timing.java b/curator-test/src/main/java/org/apache/curator/test/Timing.java
index 2bd9159..f29b1c5 100644
--- a/curator-test/src/main/java/org/apache/curator/test/Timing.java
+++ b/curator-test/src/main/java/org/apache/curator/test/Timing.java
@@ -41,11 +41,7 @@
      */
     public Timing()
     {
-        this
-        (
-            Integer.getInteger("timing-multiple", 1),
-            Integer.getInteger("timing-waiting-multiple", DEFAULT_WAITING_MULTIPLE)
-        );
+        this(Integer.getInteger("timing-multiple", 1), getWaitingMultiple());
     }
 
     /**
@@ -55,7 +51,7 @@
      */
     public Timing(double multiple)
     {
-        this((long)(DEFAULT_SECONDS * multiple), TimeUnit.SECONDS, DEFAULT_WAITING_MULTIPLE);
+        this((long)(DEFAULT_SECONDS * multiple), TimeUnit.SECONDS, getWaitingMultiple());
     }
 
     /**
@@ -75,7 +71,7 @@
      */
     public Timing(long value, TimeUnit unit)
     {
-        this(value, unit, DEFAULT_WAITING_MULTIPLE);
+        this(value, unit, getWaitingMultiple());
     }
 
     /**
@@ -222,4 +218,9 @@
     {
         return milliseconds();
     }
+
+    private static Integer getWaitingMultiple()
+    {
+        return Integer.getInteger("timing-waiting-multiple", DEFAULT_WAITING_MULTIPLE);
+    }
 }