You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/01/15 20:10:34 UTC

svn commit: r1558523 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/contrib/ solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java

Author: markrmiller
Date: Wed Jan 15 19:10:34 2014
New Revision: 1558523

URL: http://svn.apache.org/r1558523
Log:
SOLR-1301: Fix compilation for Java 8 (the Java 8 compiler is more picky, but it's not a Java 8 regression: the code was just wrong)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java

Modified: lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java?rev=1558523&r1=1558522&r2=1558523&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-cell/src/java/org/apache/solr/morphlines/cell/SolrCellBuilder.java Wed Jan 15 19:10:34 2014
@@ -124,7 +124,7 @@ public final class SolrCellBuilder imple
       if (uprefix != null) {
         cellParams.put(ExtractingParams.UNKNOWN_FIELD_PREFIX, uprefix);
       }
-      for (String capture : getConfigs().getStringList(config, ExtractingParams.CAPTURE_ELEMENTS, Collections.EMPTY_LIST)) {
+      for (String capture : getConfigs().getStringList(config, ExtractingParams.CAPTURE_ELEMENTS, Collections.<String>emptyList())) {
         cellParams.put(ExtractingParams.CAPTURE_ELEMENTS, capture);
       }
       Config fmapConfig = getConfigs().getConfig(config, "fmap", null);
@@ -182,7 +182,7 @@ public final class SolrCellBuilder imple
         Parser parser = (Parser) obj;
         this.parsers.add(parser);
 
-        List<String> mediaTypes = getConfigs().getStringList(parserConfig, SUPPORTED_MIME_TYPES, Collections.EMPTY_LIST);
+        List<String> mediaTypes = getConfigs().getStringList(parserConfig, SUPPORTED_MIME_TYPES, Collections.<String>emptyList());
         for (String mediaTypeStr : mediaTypes) {
           MediaType mediaType = parseMediaType(mediaTypeStr);
           addSupportedMimeType(mediaTypeStr);
@@ -195,7 +195,7 @@ public final class SolrCellBuilder imple
             addSupportedMimeType(mediaType.toString());
             this.mediaTypeToParserMap.put(mediaType, parser);
           }        
-          List<String> extras = getConfigs().getStringList(parserConfig, ADDITIONAL_SUPPORTED_MIME_TYPES, Collections.EMPTY_LIST);
+          List<String> extras = getConfigs().getStringList(parserConfig, ADDITIONAL_SUPPORTED_MIME_TYPES, Collections.<String>emptyList());
           for (String mediaTypeStr : extras) {
             MediaType mediaType = parseMediaType(mediaTypeStr);
             addSupportedMimeType(mediaTypeStr);