From f34f5ef9873909df51f105e8f10ceb247420f35a Mon Sep 17 00:00:00 2001 From: Noble Paul Date: Thu, 3 Sep 2009 06:46:47 +0000 Subject: [PATCH] SOLR-1399. Lock settings are ignored git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@810788 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/solr/core/SolrCore.java | 2 +- src/java/org/apache/solr/update/SolrIndexWriter.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/java/org/apache/solr/core/SolrCore.java b/src/java/org/apache/solr/core/SolrCore.java index 49fa6765a37..5485f3c0995 100644 --- a/src/java/org/apache/solr/core/SolrCore.java +++ b/src/java/org/apache/solr/core/SolrCore.java @@ -385,7 +385,7 @@ public final class SolrCore implements SolrInfoMBean { log.warn(logid+"Solr index directory '" + dirFile + "' doesn't exist." + " Creating new index..."); - SolrIndexWriter writer = new SolrIndexWriter("SolrCore.initIndex", getIndexDir(), getDirectoryFactory(), true, schema, solrConfig.mainIndexConfig); + SolrIndexWriter writer = new SolrIndexWriter("SolrCore.initIndex", getIndexDir(), getDirectoryFactory(), true, schema, solrConfig.mainIndexConfig, solrDelPolicy); writer.close(); } diff --git a/src/java/org/apache/solr/update/SolrIndexWriter.java b/src/java/org/apache/solr/update/SolrIndexWriter.java index 56e179ba294..b40c61a6579 100644 --- a/src/java/org/apache/solr/update/SolrIndexWriter.java +++ b/src/java/org/apache/solr/update/SolrIndexWriter.java @@ -153,9 +153,7 @@ public class SolrIndexWriter extends IndexWriter { init(name, schema, null); } - /** - * - */ + @Deprecated public SolrIndexWriter(String name, String path, DirectoryFactory dirFactory, boolean create, IndexSchema schema, SolrIndexConfig config) throws IOException { super(getDirectory(path, dirFactory, null), config.luceneAutoCommit, schema.getAnalyzer(), create); init(name, schema, config);