diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java index 91d563f4764..fd7d35938f8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java @@ -300,6 +300,9 @@ public class TestConcurrentMergeScheduler extends LuceneTestCase { } } }; + if (maxMergeThreads > cms.getMaxMergeCount()) { + cms.setMaxMergeCount(maxMergeCount); + } cms.setMaxThreadCount(maxMergeThreads); cms.setMaxMergeCount(maxMergeCount); iwc.setMergeScheduler(cms);