You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2015/03/19 16:35:54 UTC

svn commit: r1667794 - in /lucene/dev/trunk: ./ lucene/ lucene/analysis/ lucene/analysis/common/ solr/ solr/core/ solr/core/src/java/org/apache/solr/util/CommandOperation.java

Author: uschindler
Date: Thu Mar 19 15:35:53 2015
New Revision: 1667794

URL: http://svn.apache.org/r1667794
Log:
Merged revision(s) 1667784 from lucene/dev/branches/branch_5x:
Forward port this fix from the Java 9 bugfix, because the cast was actually wrong.

Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/analysis/   (props changed)
    lucene/dev/trunk/lucene/analysis/common/   (props changed)
    lucene/dev/trunk/solr/   (props changed)
    lucene/dev/trunk/solr/core/   (props changed)
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/CommandOperation.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/CommandOperation.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/CommandOperation.java?rev=1667794&r1=1667793&r2=1667794&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/CommandOperation.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/CommandOperation.java Thu Mar 19 15:35:53 2015
@@ -168,7 +168,7 @@ public class CommandOperation {
     getMapVal(null);
     if (hasError()) return emptyMap();//just to verify the type is Map
     @SuppressWarnings("unchecked") 
-    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);