From ea255484c413412e979e01c8a3ccd92b25f2a572 Mon Sep 17 00:00:00 2001
From: Michael McCandless <mikemccand@apache.org>
Date: Mon, 12 Nov 2012 11:36:43 +0000
Subject: [PATCH] fix test bug

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1408251 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/lucene/index/TestConcurrentMergeScheduler.java  | 3 +++
 1 file changed, 3 insertions(+)

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);