jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r544260 - /jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
Date Mon, 04 Jun 2007 20:52:18 GMT
Author: jukka
Date: Mon Jun  4 13:52:17 2007
New Revision: 544260

URL: http://svn.apache.org/viewvc?view=rev&rev=544260
Log:
1.3: Merged revision 532351 (JCR-886)

Modified:
    jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java

Modified: jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java?view=diff&rev=544260&r1=544259&r2=544260
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
(original)
+++ jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
Mon Jun  4 13:52:17 2007
@@ -791,7 +791,11 @@
         // remove it from the lists if index is registered
         indexes.remove(index);
         indexNames.removeName(index.getName());
-        deletable.addName(index.getName());
+        // during recovery it may happen that an index had already been marked
+        // deleted, so we need to check if it is already marked deleted.
+        if (!deletable.contains(index.getName())) {
+            deletable.addName(index.getName());
+        }
     }
 
     /**



Mime
View raw message