You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2013/11/22 14:00:21 UTC

svn commit: r1544518 - in /lucene/dev/trunk/solr/core/src/java/org/apache/solr: cloud/OverseerCollectionProcessor.java handler/admin/CollectionsHandler.java

Author: erick
Date: Fri Nov 22 13:00:20 2013
New Revision: 1544518

URL: http://svn.apache.org/r1544518
Log:
SOLR-5491: Testing for extra properties should use startsWith rather than indexOf

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1544518&r1=1544517&r2=1544518&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Fri Nov 22 13:00:20 2013
@@ -1309,7 +1309,7 @@ public class OverseerCollectionProcessor
   private void addPropertyParams(ZkNodeProps message, ModifiableSolrParams params) {
     // Now add the property.key=value pairs
     for (String key : message.keySet()) {
-      if (key.indexOf(COLL_PROP_PREFIX) != -1) {
+      if (key.startsWith(COLL_PROP_PREFIX)) {
         params.set(key, message.getStr(key));
       }
     }

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java?rev=1544518&r1=1544517&r2=1544518&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java Fri Nov 22 13:00:20 2013
@@ -379,7 +379,7 @@ public class CollectionsHandler extends 
     Iterator<String> iter =  params.getParameterNamesIterator();
     while (iter.hasNext()) {
       String param = iter.next();
-      if (param.indexOf(OverseerCollectionProcessor.COLL_PROP_PREFIX) != -1) {
+      if (param.startsWith(OverseerCollectionProcessor.COLL_PROP_PREFIX)) {
         props.put(param, params.get(param));
       }
     }