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 601FA200B4C for ; Fri, 8 Jul 2016 02:32:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5E9DD160A72; Fri, 8 Jul 2016 00:32:21 +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 A80F0160A68 for ; Fri, 8 Jul 2016 02:32:20 +0200 (CEST) Received: (qmail 87733 invoked by uid 500); 8 Jul 2016 00:32:19 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 87724 invoked by uid 99); 8 Jul 2016 00:32:19 -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; Fri, 08 Jul 2016 00:32:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 40CD5E03CE; Fri, 8 Jul 2016 00:32:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: markrmiller@apache.org To: commits@lucene.apache.org Message-Id: <0719baa2a8b94167bf045c1e1abea6c9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:branch_6x: SOLR-9236: Don't use System.currentTimeMillis. Date: Fri, 8 Jul 2016 00:32:19 +0000 (UTC) archived-at: Fri, 08 Jul 2016 00:32:21 -0000 Repository: lucene-solr Updated Branches: refs/heads/branch_6x e91863b8e -> b0386f0d6 SOLR-9236: Don't use System.currentTimeMillis. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b0386f0d Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b0386f0d Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b0386f0d Branch: refs/heads/branch_6x Commit: b0386f0d643febdaed32575cccc84eb06af08f5c Parents: e91863b Author: markrmiller Authored: Thu Jul 7 20:31:53 2016 -0400 Committer: markrmiller Committed: Thu Jul 7 20:32:09 2016 -0400 ---------------------------------------------------------------------- .../org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b0386f0d/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java index a28f559..d7a1fb2 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java @@ -314,11 +314,11 @@ public class SharedFSAutoReplicaFailoverTest extends AbstractFullDistribZkTestBa private void queryAndAssertResultSize(String collection, int expectedResultSize, int timeoutMS) throws SolrServerException, IOException, InterruptedException { - long startTimestamp = System.currentTimeMillis(); + long startTimestamp = System.nanoTime(); long actualResultSize = 0; while(true) { - if (System.currentTimeMillis() - startTimestamp > timeoutMS || actualResultSize > expectedResultSize) { + if (System.nanoTime() - startTimestamp > TimeUnit.MILLISECONDS.toNanos(timeoutMS) || actualResultSize > expectedResultSize) { fail("expected: " + expectedResultSize + ", actual: " + actualResultSize); } SolrParams queryAll = new SolrQuery("*:*");