You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2011/07/08 20:29:20 UTC

svn commit: r1144417 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/backwards/ lucene/backwards/src/test-framework/ lucene/backwards/src/test/ solr/ solr/src/java/org/apache/solr/core/ solr/src/test/org/apache/solr/core/

Author: hossman
Date: Fri Jul  8 18:29:20 2011
New Revision: 1144417

URL: http://svn.apache.org/viewvc?rev=1144417&view=rev
Log:
SOLR-2541: merge 1144415 from trunk

Added:
    lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/core/PluginInfoTest.java
      - copied unchanged from r1144415, lucene/dev/trunk/solr/src/test/org/apache/solr/core/PluginInfoTest.java
Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/   (props changed)
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/PluginInfo.java

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1144417&r1=1144416&r2=1144417&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Fri Jul  8 18:29:20 2011
@@ -67,6 +67,10 @@ Bug Fixes
   multiple files in a single request.
   (Stephan Günther, hossman)
 
+* SOLR-2541: PluginInfos was not correctly parsing <long/> tags when 
+  initializing plugins
+  (Frank Wesemann, hossman)
+
 Other Changes
 ----------------------
 

Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/PluginInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/PluginInfo.java?rev=1144417&r1=1144416&r2=1144417&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/PluginInfo.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/core/PluginInfo.java Fri Jul  8 18:29:20 2011
@@ -104,5 +104,11 @@ public class PluginInfo {
     return result;
   }
   public static final PluginInfo EMPTY_INFO = new PluginInfo("",Collections.<String,String>emptyMap(), new NamedList(),Collections.<PluginInfo>emptyList());
-  private static final HashSet<String> NL_TAGS = new HashSet<String>(Arrays.asList("lst","str","int","bool","arr","float","double"));
+
+  private static final HashSet<String> NL_TAGS = new HashSet<String>
+    (Arrays.asList("lst", "arr",
+                   "bool",
+                   "str",
+                   "int","long",
+                   "float","double"));
 }