Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E00D694D3 for ; Fri, 2 Dec 2011 02:57:20 +0000 (UTC) Received: (qmail 34497 invoked by uid 500); 2 Dec 2011 02:57:20 -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 34490 invoked by uid 99); 2 Dec 2011 02:57:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 02:57:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 02 Dec 2011 02:57:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9449F23889E0; Fri, 2 Dec 2011 02:56:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209342 - /lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java Date: Fri, 02 Dec 2011 02:56:55 -0000 To: commits@lucene.apache.org From: markrmiller@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111202025655.9449F23889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markrmiller Date: Fri Dec 2 02:56:54 2011 New Revision: 1209342 URL: http://svn.apache.org/viewvc?rev=1209342&view=rev Log: call destroy on solr filter before shutting down jetty to prevent dir being left open sometimes Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java?rev=1209342&r1=1209341&r2=1209342&view=diff ============================================================================== --- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java (original) +++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullDistributedZkTest.java Fri Dec 2 02:56:54 2011 @@ -105,6 +105,8 @@ public class FullDistributedZkTest exten public JettySolrRunner killShard(String slice, int index) throws Exception { JettySolrRunner jetty = shardToJetty.get(slice).get(index).jetty; + // get a clean shutdown so that no dirs are left open... + ((SolrDispatchFilter)jetty.getDispatchFilter().getFilter()).destroy(); jetty.stop(); return jetty; }