You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2018/04/02 16:24:08 UTC
lucene-solr:branch_7x: SOLR-9399: Delete requests do not send
credentials & fails for Basic Authentication
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 7bc454ad9 -> b217f517f
SOLR-9399: Delete requests do not send credentials & fails for Basic Authentication
(cherry picked from commit d2cb6ad)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b217f517
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b217f517
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b217f517
Branch: refs/heads/branch_7x
Commit: b217f517f9e023ca113a7b288e36b9485200d653
Parents: 7bc454a
Author: Erick <er...@apache.org>
Authored: Mon Apr 2 09:17:02 2018 -0700
Committer: Erick <er...@apache.org>
Committed: Mon Apr 2 09:21:30 2018 -0700
----------------------------------------------------------------------
.../src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java | 1 +
.../java/org/apache/solr/client/solrj/request/UpdateRequest.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b217f517/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 17b64ab..34d789f 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
@@ -588,6 +588,7 @@ public class CloudSolrClient extends SolrClient {
nonRoutableRequest = new UpdateRequest();
}
nonRoutableRequest.setParams(nonRoutableParams);
+ nonRoutableRequest.setBasicAuthCredentials(request.getBasicAuthUser(), request.getBasicAuthPassword());
List<String> urlList = new ArrayList<>();
urlList.addAll(routes.keySet());
Collections.shuffle(urlList, rand);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b217f517/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java
index 0d9867c..d4da965 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java
@@ -330,6 +330,7 @@ public class UpdateRequest extends AbstractUpdateRequest {
urequest.setParams(params);
urequest.deleteById(deleteId, version);
urequest.setCommitWithin(getCommitWithin());
+ urequest.setBasicAuthCredentials(getBasicAuthUser(), getBasicAuthPassword());
request = new LBHttpSolrClient.Req(urequest, urls);
routes.put(leaderUrl, request);
}