You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2009/04/03 14:14:33 UTC

svn commit: r761645 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMigration.java

Author: mreutegg
Date: Fri Apr  3 12:14:32 2009
New Revision: 761645

URL: http://svn.apache.org/viewvc?rev=761645&view=rev
Log:
JCR-2027: Remove background initialization of hierarchy cache

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMigration.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMigration.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMigration.java?rev=761645&r1=761644&r2=761645&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMigration.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexMigration.java Fri Apr  3 12:14:32 2009
@@ -85,15 +85,12 @@
             }
         } finally {
             reader.release();
+            index.releaseWriterAndReaders();
         }
 
         // if we get here then the index must be migrated
         log.debug("Index requires migration {}", indexDir);
 
-        // make sure readers are closed, otherwise the directory
-        // cannot be deleted
-        index.releaseWriterAndReaders();
-
         String migrationName = index.getName() + "_v2.3";
         if (directoryManager.hasDirectory(migrationName)) {
             directoryManager.delete(migrationName);