lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1667784 - in /lucene/dev/branches/branch_5x: lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java solr/core/src/java/org/apache/solr/util/CommandOperation.java
Date Thu, 19 Mar 2015 14:59:34 GMT
Author: uschindler
Date: Thu Mar 19 14:59:34 2015
New Revision: 1667784

URL: http://svn.apache.org/r1667784
Log:
Fix Java 9b54+ compiler bugs (only happens on branch_5x, because -source 1.7)

Modified:
    lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/CommandOperation.java

Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java?rev=1667784&r1=1667783&r2=1667784&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java
(original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java
Thu Mar 19 14:59:34 2015
@@ -565,7 +565,8 @@ public class CharArrayMap<V> extends Abs
       m.values = values;
       return m;
     }
-    return new CharArrayMap<>(map, false);
+    // In jdk-9b54 or later, a plain diamond causes compile error with "-source 1.7":
+    return new CharArrayMap<V>(map, false);
   }
   
   /** Returns an empty, unmodifiable map. */

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/CommandOperation.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/CommandOperation.java?rev=1667784&r1=1667783&r2=1667784&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/CommandOperation.java
(original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/CommandOperation.java
Thu Mar 19 14:59:34 2015
@@ -166,7 +166,7 @@ public class CommandOperation {
   public Map getValuesExcluding(String... keys) {
     getMapVal(null);
     if (hasError()) return emptyMap();//just to verify the type is Map
-    LinkedHashMap<String, Object> cp = new LinkedHashMap<>((Map<String, ?>)
commandData);
+    LinkedHashMap<String, Object> cp = new LinkedHashMap<>((Map<String, Object>)
commandData);
     if (keys == null) return cp;
     for (String key : keys) {
       cp.remove(key);



Mime
View raw message