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 C9A4C200D0C for ; Wed, 20 Sep 2017 16:46:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C89D01609E2; Wed, 20 Sep 2017 14:46:39 +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 1461B1609E1 for ; Wed, 20 Sep 2017 16:46:38 +0200 (CEST) Received: (qmail 78857 invoked by uid 500); 20 Sep 2017 14:46:38 -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 78848 invoked by uid 99); 20 Sep 2017 14:46:38 -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; Wed, 20 Sep 2017 14:46:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0C97DF1741; Wed, 20 Sep 2017 14:46:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: noble@apache.org To: commits@lucene.apache.org Message-Id: <7cf0d0f81e574b91852199bb922c911e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:jira/solr-11285: create a new instance everytime Date: Wed, 20 Sep 2017 14:46:38 +0000 (UTC) archived-at: Wed, 20 Sep 2017 14:46:40 -0000 Repository: lucene-solr Updated Branches: refs/heads/jira/solr-11285 2539f021b -> 98a595524 create a new instance everytime Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/98a59552 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/98a59552 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/98a59552 Branch: refs/heads/jira/solr-11285 Commit: 98a59552478cf3a155b9fb2071607ae7d9f3acac Parents: 2539f02 Author: Noble Paul Authored: Thu Sep 21 00:15:50 2017 +0930 Committer: Noble Paul Committed: Thu Sep 21 00:15:50 2017 +0930 ---------------------------------------------------------------------- solr/core/src/test/org/apache/solr/cloud/OverseerTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/98a59552/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java index 550b012..21e7d85 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java @@ -1207,12 +1207,15 @@ public class OverseerTest extends SolrTestCaseJ4 { when(zkController.getCoreContainer()).thenReturn(mockAlwaysUpCoreContainer); when(zkController.getZkClient()).thenReturn(zkClient); when(zkController.getZkStateReader()).thenReturn(reader); + when(zkController.getSolrCloudDataProvider()).thenReturn(getCloudDataProvider(zkClient,reader)); + return zkController; + } + + private SolrCloudDataProvider getCloudDataProvider(SolrZkClient zkClient, ZkStateReader reader) { CloudSolrClient client = new CloudSolrClient.Builder() .withClusterStateProvider(new ZkClientClusterStateProvider(reader)) .build(); - SolrCloudDataProvider dataProvider = new SolrClientCloudDataProvider(new ZkDistributedQueueFactory(zkClient), client); - when(zkController.getSolrCloudDataProvider()).thenReturn(dataProvider); - return zkController; + return new SolrClientCloudDataProvider(new ZkDistributedQueueFactory(zkClient), client); } @Test