[solr] branch branch_9x updated: SOLR-16450: waitForState to cleanly unregister watches if there is a failure

[no...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

noble pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 97a7e5df616 SOLR-16450: waitForState to cleanly unregister watches if there is a failure
97a7e5df616 is described below

commit 97a7e5df6163452872a516a0b507a9669d1d9ea3
Author: Noble Paul <no...@gmail.com>
AuthorDate: Wed Oct 19 05:57:52 2022 +1100

    SOLR-16450: waitForState to cleanly unregister watches if there is a failure
---
 .../src/java/org/apache/solr/common/cloud/ZkStateReader.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 573cf45b6c5..26239784115 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -1896,9 +1896,9 @@ public class ZkStateReader implements SolrCloseable {
 
           return matches;
         };
-    registerCollectionStateWatcher(collection, watcher);
 
     try {
+      registerCollectionStateWatcher(collection, watcher);
       // wait for the watcher predicate to return true, or time out
       if (!latch.await(wait, unit))
         throw new TimeoutException(