[lucene-solr] 01/02: #137 - Move close check under this sync call.

[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

commit f8911ef3fa71cc66addf49084135d7d79a7e12ff
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 14 09:30:09 2020 -0500

    #137 - Move close check under this sync call.
---
 solr/core/src/java/org/apache/solr/core/SolrCore.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index e3cc6c1..d866eaf 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2100,9 +2100,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
     boolean success = false;
     openSearcherLock.lock();
     try {
-      if (isClosed() || (getCoreContainer() != null && getCoreContainer().isShutDown())) {
-        throw new AlreadyClosedException();
-      }
+
       String newIndexDir = getNewIndexDir();
       String indexDirFile = null;
       String newIndexDirFile = null;
@@ -2114,7 +2112,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
       }
 
       synchronized (searcherLock) {
-        if (isClosed()) { // if we start new searchers after close we won't close them
+        if (isClosed() || (getCoreContainer() != null && getCoreContainer().isShutDown())) { // if we start new searchers after close we won't close them
           throw new SolrCoreState.CoreIsClosedException();
         }