Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9511D200C52 for ; Mon, 10 Apr 2017 20:37:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 938C9160B99; Mon, 10 Apr 2017 18:37:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DBF81160B7F for ; Mon, 10 Apr 2017 20:37:46 +0200 (CEST) Received: (qmail 55433 invoked by uid 500); 10 Apr 2017 18:37:46 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 55423 invoked by uid 99); 10 Apr 2017 18:37:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Apr 2017 18:37:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E001DE024D; Mon, 10 Apr 2017 18:37:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wang@apache.org To: common-commits@hadoop.apache.org Message-Id: <6f808cbd2ad5439dbc2aab3fb385b155@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-14293. Initialize FakeTimer with a less trivial value. Date: Mon, 10 Apr 2017 18:37:45 +0000 (UTC) archived-at: Mon, 10 Apr 2017 18:37:47 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.7 e5d5d0ddb -> 60a3a6399 HADOOP-14293. Initialize FakeTimer with a less trivial value. (cherry picked from commit be144117a885cb39bc192279c96cbe3790dc77b1) (cherry picked from commit dab1deb9a0c96471b6da4ef95be86cbc81d55305) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/60a3a639 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/60a3a639 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/60a3a639 Branch: refs/heads/branch-2.7 Commit: 60a3a6399018724b9bf4af7801ac486980a88474 Parents: e5d5d0d Author: Andrew Wang Authored: Mon Apr 10 11:37:01 2017 -0700 Committer: Andrew Wang Committed: Mon Apr 10 11:37:38 2017 -0700 ---------------------------------------------------------------------- .../src/test/java/org/apache/hadoop/util/FakeTimer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/60a3a639/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/FakeTimer.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/FakeTimer.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/FakeTimer.java index 2b5f850..1b17ce7 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/FakeTimer.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/FakeTimer.java @@ -33,7 +33,8 @@ public class FakeTimer extends Timer { /** Constructs a FakeTimer with a non-zero value */ public FakeTimer() { - nowNanos = 1000; // Initialize with a non-trivial value. + // Initialize with a non-trivial value. + nowNanos = TimeUnit.MILLISECONDS.toNanos(1000); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org