You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by mi...@apache.org on 2012/11/13 14:37:18 UTC

svn commit: r1408719 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java

Author: mikemccand
Date: Tue Nov 13 13:37:18 2012
New Revision: 1408719

URL: http://svn.apache.org/viewvc?rev=1408719&view=rev
Log:
fix test bug

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java?rev=1408719&r1=1408718&r2=1408719&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java Tue Nov 13 13:37:18 2012
@@ -300,6 +300,9 @@ public class TestConcurrentMergeSchedule
         }
       }
       };
+    if (maxMergeThreads > cms.getMaxMergeCount()) {
+      cms.setMaxMergeCount(maxMergeCount);
+    }
     cms.setMaxThreadCount(maxMergeThreads);
     cms.setMaxMergeCount(maxMergeCount);
     iwc.setMergeScheduler(cms);