svn commit: r727779 - /lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java

[shalin]

Author: shalin
Date: Thu Dec 18 10:00:06 2008
New Revision: 727779

URL: http://svn.apache.org/viewvc?rev=727779&view=rev
Log:
SOLR-863 -- Fixing NPE. DirectoryFactory should be created before calling 
SolrIndexWriter.getDirectory.

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java?rev=727779&r1=727778&r2=727779&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java Thu Dec 18 
10:00:06 2008
@@ -357,6 +357,9 @@
       boolean indexExists = dirFile.canRead();
       boolean firstTime = dirs.add(dirFile.getCanonicalPath());
       boolean removeLocks = solrConfig.getBool("mainIndex/unlockOnStartup", 
false);
+
+      initDirectoryFactory();
+
       if (indexExists && firstTime && removeLocks) {
         // to remove locks, the directory must already exist... so we create it
         // if it didn't exist already...
@@ -378,8 +381,6 @@
         SolrIndexWriter writer = new 
SolrIndexWriter("SolrCore.initIndex",getIndexDir(), true, schema, 
solrConfig.mainIndexConfig);
         writer.close();
       }
-      
-      initDirectoryFactory();
 
     } catch (IOException e) {
       throw new RuntimeException(e);