svn commit: r1052301 - /lucene/dev/trunk/solr/src/java/org/apache/solr/util/SolrPluginUtils.java

[yo...@apache.org]

Author: yonik
Date: Thu Dec 23 15:40:46 2010
New Revision: 1052301

URL: http://svn.apache.org/viewvc?rev=1052301&view=rev
Log:
SOLR-2275: mm param parsing optimization - fix pattern

Modified:
    lucene/dev/trunk/solr/src/java/org/apache/solr/util/SolrPluginUtils.java

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=1052301&r1=1052300&r2=1052301&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/util/SolrPluginUtils.java Thu Dec 23 15:40:46 2010
@@ -609,7 +609,7 @@ public class SolrPluginUtils {
   }
 
   // private static Pattern spaceAroundLessThanPattern = Pattern.compile("\\s*<\\s*");
-  private static Pattern spaceAroundLessThanPattern = Pattern.compile("(\\s+<)|(<\\s+)|(\\s+<\\s+)");
+  private static Pattern spaceAroundLessThanPattern = Pattern.compile("(\\s+<\\s*)|(\\s*<\\s+)");
   private static Pattern spacePattern = Pattern.compile(" ");
   private static Pattern lessThanPattern = Pattern.compile("<");
 
@@ -625,9 +625,8 @@ public class SolrPluginUtils {
     if (-1 < spec.indexOf("<")) {
       /* we have conditional spec(s) */
       spec = spaceAroundLessThanPattern.matcher(spec).replaceAll("<");
-
       for (String s : spacePattern.split(spec)) {
-        String[] parts = lessThanPattern.split(s);
+        String[] parts = lessThanPattern.split(s,0);
         int upperBound = Integer.parseInt(parts[0]);
         if (optionalClauseCount <= upperBound) {
           return result;