You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/08/11 00:28:09 UTC
[lucene-solr] branch reference_impl updated (75ae1b7 -> 92f1540)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 75ae1b7 @485 Cleanup, lots of unused imports.
new 7256be2 @486 Relax check.
new 92f1540 @487 Races.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/core/src/java/org/apache/solr/core/SolrCore.java | 2 +-
.../src/java/org/apache/solr/handler/component/SearchHandler.java | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
[lucene-solr] 02/02: @487 Races.
Posted by 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 92f1540acef724b9c622ab993768447509595d8a
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Aug 10 19:26:06 2020 -0500
@487 Races.
---
.../src/java/org/apache/solr/handler/component/SearchHandler.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index f737d4e..d0c2480 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -73,9 +73,9 @@ public class SearchHandler extends RequestHandlerBase implements SolrCoreAware,
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected volatile List<SearchComponent> components;
- private ShardHandlerFactory shardHandlerFactory;
- private PluginInfo shfInfo;
- private SolrCore core;
+ private volatile ShardHandlerFactory shardHandlerFactory;
+ private volatile PluginInfo shfInfo;
+ private volatile SolrCore core;
protected List<String> getDefaultComponents() {
ArrayList<String> names = new ArrayList<>(8);
@@ -174,6 +174,7 @@ public class SearchHandler extends RequestHandlerBase implements SolrCoreAware,
@SuppressWarnings({"unchecked"})
private void initComponents() {
+ assert core != null;
Object declaredComponents = initArgs.get(INIT_COMPONENTS);
List<String> first = (List<String>) initArgs.get(INIT_FIRST_COMPONENTS);
List<String> last = (List<String>) initArgs.get(INIT_LAST_COMPONENTS);
[lucene-solr] 01/02: @486 Relax check.
Posted by 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 7256be289b081eb305867e06efe3ba26c814be6e
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Aug 10 19:18:23 2020 -0500
@486 Relax check.
---
solr/core/src/java/org/apache/solr/core/SolrCore.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 02b75ca..67edfa5 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2155,7 +2155,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
// (caches take a little while to instantiate)
final boolean useCaches = !realtime;
final String newName = realtime ? "realtime" : "main";
- if (isClosed() || (getCoreContainer() != null && getCoreContainer().isShutDown())) { // if we start new searchers after close we won't close them
+ if (isClosed()) { // if we start new searchers after close we won't close them
throw new SolrCoreState.CoreIsClosedException();
}
tmp = new SolrIndexSearcher(this, newIndexDir, getLatestSchema(), newName,