Return-Path: Delivered-To: apmail-lucene-solr-commits-archive@minotaur.apache.org Received: (qmail 45343 invoked from network); 22 Jan 2010 19:01:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Jan 2010 19:01:54 -0000 Received: (qmail 33231 invoked by uid 500); 22 Jan 2010 19:01:54 -0000 Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org Received: (qmail 33152 invoked by uid 500); 22 Jan 2010 19:01:53 -0000 Mailing-List: contact solr-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: solr-dev@lucene.apache.org Delivered-To: mailing list solr-commits@lucene.apache.org Received: (qmail 33141 invoked by uid 99); 22 Jan 2010 19:01:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jan 2010 19:01:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jan 2010 19:01:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 13C3523889E5; Fri, 22 Jan 2010 19:01:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r902219 - in /lucene/solr/branches/cloud/src: java/org/apache/solr/cloud/ZkController.java test/org/apache/solr/cloud/ZkControllerTest.java Date: Fri, 22 Jan 2010 19:01:29 -0000 To: solr-commits@lucene.apache.org From: markrmiller@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100122190130.13C3523889E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markrmiller Date: Fri Jan 22 19:01:29 2010 New Revision: 902219 URL: http://svn.apache.org/viewvc?rev=902219&view=rev Log: fix ZkControllerTest Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java?rev=902219&r1=902218&r2=902219&view=diff ============================================================================== --- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java (original) +++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java Fri Jan 22 19:01:29 2010 @@ -103,15 +103,15 @@ * @param localHost * @param locaHostPort * @param localHostContext - * @param coreConatiner + * @param coreContainer * @throws InterruptedException * @throws TimeoutException * @throws IOException */ public ZkController(String zkServerAddress, int zkClientTimeout, String localHost, String locaHostPort, - String localHostContext, final CoreContainer coreConatiner) throws InterruptedException, + String localHostContext, final CoreContainer coreContainer) throws InterruptedException, TimeoutException, IOException { - this.coreContainer = coreConatiner; + this.coreContainer = coreContainer; this.zkServerAddress = zkServerAddress; this.localHostPort = locaHostPort; this.localHostContext = localHostContext; @@ -126,9 +126,13 @@ // for others to do the same, then load createEphemeralNode(); // register cores in case any new cores came online will zk was down - Collection cores = coreConatiner.getCores(); - for(SolrCore core : cores) { - register(core, false); + + // coreContainer may currently be null in tests, so don't reregister + if(coreContainer != null) { + Collection cores = coreContainer.getCores(); + for(SolrCore core : cores) { + register(core, false); + } } updateCloudState(); } catch (KeeperException e) { Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=902219&r1=902218&r2=902219&view=diff ============================================================================== --- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java (original) +++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java Fri Jan 22 19:01:29 2010 @@ -79,7 +79,7 @@ } zkController = new ZkController(AbstractZkTestCase.ZOO_KEEPER_ADDRESS, TIMEOUT, "localhost", - "8983", "/solr"); + "8983", "/solr", null); zkController.updateCloudState(); CloudState cloudInfo = zkController.getCloudState(); Map slices = cloudInfo.getSlices("collection1"); @@ -152,7 +152,7 @@ } zkClient.close(); ZkController zkController = new ZkController(AbstractZkTestCase.ZOO_KEEPER_ADDRESS, TIMEOUT, - "localhost", "8983", "/solr"); + "localhost", "8983", "/solr", null); try { String configName = zkController.readConfigName(COLLECTION_NAME); assertEquals(configName, actualConfigName); @@ -178,7 +178,7 @@ AbstractZkTestCase.makeSolrZkNode(); zkController = new ZkController(AbstractZkTestCase.ZOO_KEEPER_ADDRESS, TIMEOUT, "localhost", - "8983", "/solr"); + "8983", "/solr", null); zkController.uploadDirToCloud(new File("solr/conf"), ZkController.CONFIGS_ZKNODE + "/config1");