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 2017/07/18 00:51:47 UTC
lucene-solr:branch_6x: SOLR-11104: LbHttpSolrClient ignores given
HttpClient in constructor on 6.x
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 4080791e0 -> 139069100
SOLR-11104: LbHttpSolrClient ignores given HttpClient in constructor on 6.x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/13906910
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/13906910
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/13906910
Branch: refs/heads/branch_6x
Commit: 13906910035c94e6550debfba7dd16ff98e6adea
Parents: 4080791
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Tue Jul 18 06:21:30 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Tue Jul 18 06:21:30 2017 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/13906910/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a019b6b..8abb7f9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -152,6 +152,8 @@ when using one of Exact*StatsCache (Mikhail Khludnev)
* SOLR-10908: CloudSolrStream.toExpression incorrectly handles fq clauses (Rohit Singh via Erick Erickson)
+* SOLR-11104: LbHttpSolrClient ignores given HttpClient in constructor on 6.x (shalin)
+
Optimizations
----------------------
* SOLR-10634: JSON Facet API: When a field/terms facet will retrieve all buckets (i.e. limit:-1)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/13906910/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
index 126b188..26a19ff 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
@@ -258,8 +258,7 @@ public class LBHttpSolrClient extends SolrClient {
HttpClient httpClient, String... solrServerUrl) {
clientIsInternal = httpClient == null;
this.httpSolrClientBuilder = httpSolrClientBuilder;
- httpClient = constructClient(null);
- this.httpClient = httpClient;
+ this.httpClient = clientIsInternal ? constructClient(solrServerUrl) : httpClient;
if (solrServerUrl != null) {
for (String s : solrServerUrl) {
ServerWrapper wrapper = new ServerWrapper(makeSolrClient(s));