This is an automated email from the ASF dual-hosted git repository. hossman pushed a commit to branch jira/SOLR-6312 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 5c65eb714b520754957fe60e099c94379a09c23d Author: Chris Hostetter <[email protected]> AuthorDate: Tue Dec 20 09:28:04 2022 -0700 remove unused variable that confuses the code --- .../java/org/apache/solr/client/solrj/impl/CloudSolrClient.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 56a9c4e14c4..c05fcf70b70 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 @@ -842,11 +842,10 @@ public abstract class CloudSolrClient extends SolrClient { isCollectionRequestOfV2 = ((V2Request) request).isPerCollectionRequest(); } boolean isAdmin = ADMIN_PATHS.contains(request.getPath()); - boolean isUpdate = (request instanceof IsUpdateRequest) && (request instanceof UpdateRequest); if (!inputCollections.isEmpty() && !isAdmin && !isCollectionRequestOfV2) { // don't do _stateVer_ checking for admin, v2 api requests - Set<String> requestedCollectionNames = resolveAliases(inputCollections, isUpdate); + Set<String> requestedCollectionNames = resolveAliases(inputCollections); StringBuilder stateVerParamBuilder = null; for (String requestedCollection : requestedCollectionNames) { @@ -1043,7 +1042,6 @@ public abstract class CloudSolrClient extends SolrClient { connect(); boolean sendToLeaders = false; - boolean isUpdate = false; if (request instanceof IsUpdateRequest) { sendToLeaders = @@ -1052,7 +1050,6 @@ public abstract class CloudSolrClient extends SolrClient { // Check if we can do a "directUpdate" ... if (sendToLeaders && request instanceof UpdateRequest) { - isUpdate = true; if (inputCollections.size() > 1) { throw new SolrException( SolrException.ErrorCode.BAD_REQUEST, @@ -1098,7 +1095,7 @@ public abstract class CloudSolrClient extends SolrClient { } } else { // Typical... - Set<String> collectionNames = resolveAliases(inputCollections, isUpdate); + Set<String> collectionNames = resolveAliases(inputCollections); if (collectionNames.isEmpty()) { throw new SolrException( SolrException.ErrorCode.BAD_REQUEST, @@ -1193,7 +1190,7 @@ public abstract class CloudSolrClient extends SolrClient { * Resolves the input collections to their possible aliased collections. Doesn't validate * collection existence. */ - private Set<String> resolveAliases(List<String> inputCollections, boolean isUpdate) { + private Set<String> resolveAliases(List<String> inputCollections) { if (inputCollections.isEmpty()) { return Collections.emptySet(); }
