lucene-solr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Yonik Seeley <yo...@lucidimagination.com>
Subject Re: svn commit: r830938 - /lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
Date Thu, 29 Oct 2009 13:42:28 GMT
Shalin, are you going to commit this on the 14 branch also?

-Yonik
http://www.lucidimagination.com



On Thu, Oct 29, 2009 at 9:36 AM,  <shalin@apache.org> wrote:
> Author: shalin
> Date: Thu Oct 29 13:36:05 2009
> New Revision: 830938
>
> URL: http://svn.apache.org/viewvc?rev=830938&view=rev
> Log:
> SOLR-1527 -- shareSchema does not work with absolute paths
>
> 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=830938&r1=830937&r2=830938&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 Thu Oct 29 13:36:05
2009
> @@ -406,9 +406,12 @@
>     IndexSchema schema = null;
>     if(indexSchemaCache != null){
>       //schema sharing is enabled. so check if it already is loaded
> -      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()));
> +      File schemaFile = new File(dcore.getSchemaName());
> +      if (!schemaFile.isAbsolute()) {
> +        schemaFile = new File(solrLoader.getInstanceDir() + "conf" + File.separator
+ dcore.getSchemaName());
> +      }
> +      if(schemaFile. exists()){
> +        String key = schemaFile.getAbsolutePath()+":"+new SimpleDateFormat("yyyyMMddhhmmss").format(new
Date(schemaFile.lastModified()));
>         schema = indexSchemaCache.get(key);
>         if(schema == null){
>           log.info("creating new schema object for core: " + dcore.name);
>
>
>

Mime
View raw message