You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/12 13:43:33 UTC
[40/50] [abbrv] lucene-solr:jira/solr-8668: SOLR-10431: Fix precommit
SOLR-10431: Fix precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5a25ef0e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5a25ef0e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5a25ef0e
Branch: refs/heads/jira/solr-8668
Commit: 5a25ef0e77c2fdffcc2ea00988724c292858dea4
Parents: cc8b5ba
Author: Cao Manh Dat <da...@apache.org>
Authored: Thu May 11 09:28:53 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Thu May 11 09:28:53 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/solr/client/solrj/impl/CloudSolrClient.java | 2 +-
.../src/java/org/apache/solr/client/solrj/request/V2Request.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a25ef0e/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
index 3596333..ff7b06a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
@@ -1285,7 +1285,7 @@ public class CloudSolrClient extends SolrClient {
Set<String> liveNodes = stateProvider.liveNodes();
if (!liveNodes.isEmpty()) {
List<String> liveNodesList = new ArrayList<>(liveNodes);
- Collections.shuffle(liveNodesList);
+ Collections.shuffle(liveNodesList, rand);
theUrlList.add(ZkStateReader.getBaseUrlForNodeName(liveNodesList.get(0),
(String) stateProvider.getClusterProperty(ZkStateReader.URL_SCHEME,"http")));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5a25ef0e/solr/solrj/src/java/org/apache/solr/client/solrj/request/V2Request.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/V2Request.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/V2Request.java
index 2b33593..4e0a795 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/V2Request.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/V2Request.java
@@ -20,8 +20,6 @@ package org.apache.solr.client.solrj.request;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Collections;