[infinispan-commits] Infinispan SVN: r2143 - trunk/lucene-directory/src/test/java/org/infinispan/lucene/testutils.

[infinispan-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-08-03 12:10:24 -0400 (Tue, 03 Aug 2010)
New Revision: 2143

Modified:
   trunk/lucene-directory/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
Log:
[ISPN-307] (Lucene Directory not supporting Lucene's ConcurrentMergeScheduler) trunk

Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java	2010-08-03 16:07:29 UTC (rev 2142)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/testutils/LuceneSettings.java	2010-08-03 16:10:24 UTC (rev 2143)
@@ -45,15 +45,18 @@
    
    private static final MergeScheduler mergeScheduler = new SerialMergeScheduler();
    
-   /**
-    * Until ISPN-307 it's mandatory to set the MergeScheduler to a SerialMergeScheduler when opening an IndexWriter
-    */
-   public static IndexWriter openWriter(Directory directory, int maxMergeDocs) throws CorruptIndexException, LockObtainFailedException, IOException {
+   public static IndexWriter openWriter(Directory directory, int maxMergeDocs, boolean useSerialMerger) throws CorruptIndexException, LockObtainFailedException, IOException {
       IndexWriter iwriter = new IndexWriter(directory, LuceneSettings.analyzer, false, MaxFieldLength.UNLIMITED);
-      iwriter.setMergeScheduler(mergeScheduler);
+      if (useSerialMerger) {
+         iwriter.setMergeScheduler(mergeScheduler);
+      }
       iwriter.setMaxMergeDocs(maxMergeDocs);
       iwriter.setUseCompoundFile(false);
       return iwriter;
    }
+   
+   public static IndexWriter openWriter(Directory directory, int maxMergeDocs) throws CorruptIndexException, LockObtainFailedException, IOException {
+      return openWriter(directory, maxMergeDocs, false);
+   }
 
 }