You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by sh...@apache.org on 2013/07/31 22:20:42 UTC

svn commit: r1509017 - in /lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud: Assign.java OverseerCollectionProcessor.java

Author: shalin
Date: Wed Jul 31 20:20:42 2013
New Revision: 1509017

URL: http://svn.apache.org/r1509017
Log:
SOLR-4221: Fix compile error on Java6 due to use of diamond operator

Modified:
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Assign.java
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Assign.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Assign.java?rev=1509017&r1=1509016&r2=1509017&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Assign.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Assign.java Wed Jul 31 20:20:42 2013
@@ -191,7 +191,7 @@ public class Assign {
           + " shards to be created (higher than the allowed number)");
     }
 
-    ArrayList<Node> sortedNodeList = new ArrayList<>(nodeNameVsShardCount.values());
+    ArrayList<Node> sortedNodeList = new ArrayList<Node>(nodeNameVsShardCount.values());
     Collections.sort(sortedNodeList, new Comparator<Node>() {
       @Override
       public int compare(Node x, Node y) {

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1509017&r1=1509016&r2=1509017&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Wed Jul 31 20:20:42 2013
@@ -849,7 +849,7 @@ public class OverseerCollectionProcessor
       int repFactor = message.getInt( REPLICATION_FACTOR, 1);
       Integer numSlices = message.getInt(NUM_SLICES, null);
       String router = message.getStr(ROUTER, DocRouter.DEFAULT_NAME);
-      List<String> shardNames = new ArrayList<>();
+      List<String> shardNames = new ArrayList<String>();
       if(ImplicitDocRouter.NAME.equals(router)){
         Overseer.getShardNames(shardNames, message.getStr("shards",null));
         numSlices = shardNames.size();