[lucene-solr] branch reference_impl_dev updated: @625 Attempt to harden test.

[ma...@apache.org]

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

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new a1d0e27  @625 Attempt to harden test.
a1d0e27 is described below

commit a1d0e27fbdf51acd3919c858316abdfb480261e8
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Aug 29 10:35:32 2020 -0500

    @625 Attempt to harden test.
---
 solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java     | 4 ++++
 solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
index 5f3bfbf..0b5fe66 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
@@ -18,6 +18,7 @@
 package org.apache.solr.cloud;
 
 import org.apache.solr.client.solrj.cloud.ShardTerms;
+import org.apache.solr.common.AlreadyClosedException;
 import org.apache.solr.common.ParWork;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.SolrZkClient;
@@ -172,6 +173,9 @@ public class ZkShardTerms implements AutoCloseable{
    * Add a listener so the next time the shard's term get updated, listeners will be called
    */
   void addListener(CoreTermWatcher listener) {
+    if (isClosed.get()) {
+      throw new AlreadyClosedException();
+    }
     listeners.add(listener);
   }
 
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
index 05ebb41..279f077 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
@@ -271,7 +271,8 @@ public class ZkShardTermsTest extends SolrCloudTestCase {
     waitFor(2, count::get);
     replicaTerms.setTermEqualsToLeader("replica");
     waitFor(3, count::get);
-    assertEquals(0, replicaTerms.getNumListeners());
+    
+    waitFor(0, replicaTerms::getNumListeners);
 
     leaderTerms.close();
     replicaTerms.close();