[solr] 03/12: Fix root cause of bug

[ho...@apache.org]

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 cb52dd264e51d263b30f95802237521e088c7ebd
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Fri Dec 16 16:09:08 2022 -0700

    Fix root cause of bug
---
 .../java/org/apache/solr/client/solrj/impl/CloudSolrClient.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 b435ef72233..56a9c4e14c4 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
@@ -1046,7 +1046,12 @@ public abstract class CloudSolrClient extends SolrClient {
     boolean isUpdate = false;
 
     if (request instanceof IsUpdateRequest) {
-      if (request instanceof UpdateRequest) {
+      sendToLeaders =
+          // nocommit: also check request.isSendToLeaders() (still to be added)
+          this.isUpdatesToLeaders();
+
+      // Check if we can do a "directUpdate" ...
+      if (sendToLeaders && request instanceof UpdateRequest) {
         isUpdate = true;
         if (inputCollections.size() > 1) {
           throw new SolrException(
@@ -1064,7 +1069,6 @@ public abstract class CloudSolrClient extends SolrClient {
           return response;
         }
       }
-      sendToLeaders = true;
     }
 
     SolrParams reqParams = request.getParams();