Return-Path: Delivered-To: apmail-lucene-solr-commits-archive@minotaur.apache.org Received: (qmail 76893 invoked from network); 22 Jun 2009 09:29:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Jun 2009 09:29:41 -0000 Received: (qmail 84146 invoked by uid 500); 22 Jun 2009 09:29:52 -0000 Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org Received: (qmail 84073 invoked by uid 500); 22 Jun 2009 09:29:52 -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 84064 invoked by uid 99); 22 Jun 2009 09:29:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jun 2009 09:29:52 +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; Mon, 22 Jun 2009 09:29:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 67A0723888A0; Mon, 22 Jun 2009 09:29:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r787179 - /lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java Date: Mon, 22 Jun 2009 09:29:26 -0000 To: solr-commits@lucene.apache.org From: noble@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090622092927.67A0723888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: noble Date: Mon Jun 22 09:29:25 2009 New Revision: 787179 URL: http://svn.apache.org/viewvc?rev=787179&view=rev Log: resourceloader gives the correct instancedir Modified: lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java Modified: lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java?rev=787179&r1=787178&r2=787179&view=diff ============================================================================== --- lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java (original) +++ lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java Mon Jun 22 09:29:25 2009 @@ -367,7 +367,7 @@ IndexSchema schema = null; if(indexSchemaCache != null){ //schema sharing is enabled. so check if it already is loaded - File schemFile = new File(dcore.getInstanceDir() + "conf" + File.separator + dcore.getSchemaName()); + File schemFile = new File(solrLoader.getInstanceDir() + "conf" + File.separator + dcore.getSchemaName()); if(schemFile. exists()){ String key = schemFile.getAbsolutePath()+":"+new SimpleDateFormat("yyyyMMddhhmmss").format(new Date(schemFile.lastModified())); schema = indexSchemaCache.get(key);