Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 323BE10DCF for ; Sun, 7 Jul 2013 17:56:25 +0000 (UTC) Received: (qmail 83662 invoked by uid 500); 7 Jul 2013 17:56:25 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 83617 invoked by uid 500); 7 Jul 2013 17:56:25 -0000 Mailing-List: contact commits-help@curator.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.incubator.apache.org Delivered-To: mailing list commits@curator.incubator.apache.org Received: (qmail 83608 invoked by uid 99); 7 Jul 2013 17:56:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jul 2013 17:56:24 +0000 X-ASF-Spam-Status: No, hits=-2000.3 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 07 Jul 2013 17:56:22 +0000 Received: (qmail 83560 invoked by uid 99); 7 Jul 2013 17:56:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jul 2013 17:56:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 80D24883FE8; Sun, 7 Jul 2013 17:56:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randgalt@apache.org To: commits@curator.incubator.apache.org Date: Sun, 07 Jul 2013 17:56:02 -0000 Message-Id: In-Reply-To: <76de31ff0d7a4a53a6ee46c0d83061a3@git.apache.org> References: <76de31ff0d7a4a53a6ee46c0d83061a3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Make sure system prop timing-waiting-multiple is always used X-Virus-Checked: Checked by ClamAV on apache.org Make sure system prop timing-waiting-multiple is always used Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/477cb13e Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/477cb13e Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/477cb13e Branch: refs/heads/CURATOR-26 Commit: 477cb13e50760d8fe0044cb003a96ee4f75afde7 Parents: c8942b1 Author: randgalt Authored: Sun Jul 7 10:55:41 2013 -0700 Committer: randgalt Committed: Sun Jul 7 10:55:41 2013 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/curator/test/Timing.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/477cb13e/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 class Timing */ 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 class Timing */ 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 class Timing */ public Timing(long value, TimeUnit unit) { - this(value, unit, DEFAULT_WAITING_MULTIPLE); + this(value, unit, getWaitingMultiple()); } /** @@ -222,4 +218,9 @@ public class Timing { return milliseconds(); } + + private static Integer getWaitingMultiple() + { + return Integer.getInteger("timing-waiting-multiple", DEFAULT_WAITING_MULTIPLE); + } }