SOLR-16450: waitForState to cleanly unregister watches if there is a …

…failure
cowpaths · Oct 18, 2022 · 32e0f68 · 32e0f68
1 parent 79fba55
commit 32e0f68
Showing 1 changed file with 1 addition and 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
@@ -1896,9 +1896,9 @@ public void waitForState(
 
           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(