From 21a1b9f0056fddfa3c8dc6dd1c0c96a4d3087b41 Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Mon, 15 Mar 2010 02:23:10 +0000
Subject: [PATCH] fix test to use a valid thread count

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/branches/solr@923033 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/solr/util/SolrPluginUtils.java            | 4 ++--
 src/test/org/apache/solr/core/TestPropInject.java             | 2 +-
 .../solr/conf/solrconfig-propinject-indexdefault.xml          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java/org/apache/solr/util/SolrPluginUtils.java b/src/java/org/apache/solr/util/SolrPluginUtils.java
index 9cc04c382fa..ad658b7c1a7 100644
--- a/src/java/org/apache/solr/util/SolrPluginUtils.java
+++ b/src/java/org/apache/solr/util/SolrPluginUtils.java
@@ -988,9 +988,9 @@ public class SolrPluginUtils {
         Object val = entry.getValue();
         method.invoke(bean, val);
       } catch (InvocationTargetException e1) {
-        throw new RuntimeException("Error invoking setter " + setterName + "on class : " + clazz.getName(), e1);
+        throw new RuntimeException("Error invoking setter " + setterName + " on class : " + clazz.getName(), e1);
       } catch (IllegalAccessException e1) {
-        throw new RuntimeException("Error invoking setter " + setterName + "on class : " + clazz.getName(), e1);
+        throw new RuntimeException("Error invoking setter " + setterName + " on class : " + clazz.getName(), e1);
       }
     }
   }
diff --git a/src/test/org/apache/solr/core/TestPropInject.java b/src/test/org/apache/solr/core/TestPropInject.java
index 21a4847a27f..1c807813349 100644
--- a/src/test/org/apache/solr/core/TestPropInject.java
+++ b/src/test/org/apache/solr/core/TestPropInject.java
@@ -52,6 +52,6 @@ public class TestPropInject extends AbstractSolrTestCase {
   public void testPropsDefaults() throws Exception {
     IndexWriter writer = new ExposeWriterHandler().getWriter();
     ConcurrentMergeScheduler cms = (ConcurrentMergeScheduler)writer.getMergeScheduler();
-    assertEquals(10, cms.getMaxThreadCount());
+    assertEquals(4, cms.getMaxThreadCount());
   }
 }
diff --git a/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml b/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
index 24db6d6ccf0..1b0b3b08ac9 100644
--- a/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
+++ b/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
@@ -94,7 +94,7 @@
       can perform merges in the background using separate threads.  The SerialMergeScheduler (Lucene 2.2 default) does not.
      -->
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler">
-      <int name="maxThreadCount">10</int>
+      <int name="maxThreadCount">4</int>
     </mergeScheduler>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>