[lucene-solr] branch reference_impl updated: @349 Propagate out AlreadyClosed.

[ma...@apache.org]

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

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


The following commit(s) were added to refs/heads/reference_impl by this push:
     new 4e5f003  @349 Propagate out AlreadyClosed.
4e5f003 is described below

commit 4e5f0030ca90b9f564e452707946aed4f19315d6
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Jul 26 11:58:51 2020 -0500

    @349 Propagate out AlreadyClosed.
---
 solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
index 7c39db3..ef558b4 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
@@ -123,6 +123,9 @@ public class ZkStateWriter {
         continue;
 //        log.info("BadVersion");
 //        throw new AlreadyClosedException();
+      } catch (InterruptedException | AlreadyClosedException e) {
+        ParWork.propegateInterrupt(e);
+        throw e;
       } catch (Exception e) {
         log.error("Ran into unexpected exception trying to write new cluster state", e);
         throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
@@ -288,7 +291,7 @@ public class ZkStateWriter {
             }
           }
 
-        } catch (InterruptedException e) {
+        } catch (InterruptedException | AlreadyClosedException e) {
           ParWork.propegateInterrupt(e);
           throw e;
         } catch (Exception e) {