lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r923033 - in /lucene/solr/branches/solr/src: java/org/apache/solr/util/SolrPluginUtils.java test/org/apache/solr/core/TestPropInject.java test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
Date Mon, 15 Mar 2010 02:23:11 GMT
Author: markrmiller
Date: Mon Mar 15 02:23:10 2010
New Revision: 923033

URL: http://svn.apache.org/viewvc?rev=923033&view=rev
Log:
fix test to use a valid thread count

Modified:
    lucene/solr/branches/solr/src/java/org/apache/solr/util/SolrPluginUtils.java
    lucene/solr/branches/solr/src/test/org/apache/solr/core/TestPropInject.java
    lucene/solr/branches/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml

Modified: lucene/solr/branches/solr/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=923033&r1=923032&r2=923033&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/solr/branches/solr/src/java/org/apache/solr/util/SolrPluginUtils.java Mon Mar 15
02:23:10 2010
@@ -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);
       }
     }
   }

Modified: lucene/solr/branches/solr/src/test/org/apache/solr/core/TestPropInject.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/test/org/apache/solr/core/TestPropInject.java?rev=923033&r1=923032&r2=923033&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/test/org/apache/solr/core/TestPropInject.java (original)
+++ lucene/solr/branches/solr/src/test/org/apache/solr/core/TestPropInject.java Mon Mar 15
02:23:10 2010
@@ -52,6 +52,6 @@ public class TestPropInject extends Abst
   public void testPropsDefaults() throws Exception {
     IndexWriter writer = new ExposeWriterHandler().getWriter();
     ConcurrentMergeScheduler cms = (ConcurrentMergeScheduler)writer.getMergeScheduler();
-    assertEquals(10, cms.getMaxThreadCount());
+    assertEquals(4, cms.getMaxThreadCount());
   }
 }

Modified: lucene/solr/branches/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml?rev=923033&r1=923032&r2=923033&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
(original)
+++ lucene/solr/branches/solr/src/test/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
Mon Mar 15 02:23:10 2010
@@ -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>



Mime
View raw message