jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1307524 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
Date Fri, 30 Mar 2012 16:40:18 GMT
Author: jukka
Date: Fri Mar 30 16:40:18 2012
New Revision: 1307524

URL: http://svn.apache.org/viewvc?rev=1307524&view=rev
Log:
2.2: Merged revision 1304334 (JCR-3227)

Modified:
    jackrabbit/branches/2.2/   (props changed)
    jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java

Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
  Merged /jackrabbit/branches/2.4:r1304334

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java?rev=1307524&r1=1307523&r2=1307524&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/MultiIndex.java
Fri Mar 30 16:40:18 2012
@@ -1100,6 +1100,10 @@ public class MultiIndex {
      * @throws IOException if the volatile index cannot be reset.
      */
     private void resetVolatileIndex() throws IOException {
+        // JCR-3227 close VolatileIndex properly
+        if (volatileIndex != null) {
+            volatileIndex.close();
+        }
         volatileIndex = new VolatileIndex(handler.getTextAnalyzer(),
                 handler.getSimilarity(), indexingQueue);
         volatileIndex.setUseCompoundFile(handler.getUseCompoundFile());



Mime
View raw message