SOLR-14749: Fix an NPE.
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 04f208c..41f6547 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -785,6 +785,9 @@
*/
private void startClusterSingletons() {
PluginBag<SolrRequestHandler> handlers = getCoreContainer().getRequestHandlers();
+ if (handlers == null) {
+ return;
+ }
handlers.keySet().forEach(handlerName -> {
SolrRequestHandler handler = handlers.get(handlerName);
if (handler instanceof ClusterSingleton) {
@@ -802,6 +805,9 @@
*/
private void stopClusterSingletons() {
PluginBag<SolrRequestHandler> handlers = getCoreContainer().getRequestHandlers();
+ if (handlers == null) {
+ return;
+ }
handlers.keySet().forEach(handlerName -> {
SolrRequestHandler handler = handlers.get(handlerName);
if (handler instanceof ClusterSingleton) {
diff --git a/solr/core/src/java/org/apache/solr/cluster/events/ClusterSingleton.java b/solr/core/src/java/org/apache/solr/cluster/events/ClusterSingleton.java
index c0808e5..f52cdb8 100644
--- a/solr/core/src/java/org/apache/solr/cluster/events/ClusterSingleton.java
+++ b/solr/core/src/java/org/apache/solr/cluster/events/ClusterSingleton.java
@@ -24,7 +24,7 @@
* <li>STOPPED - the default state. The component is idle and does not perform
* any functions. It should also avoid holding any resources.</li>
* <li>RUNNING - the component is active.</li>
- * </ul></p>
+ * </ul>
* <p>Components must be prepared to change these states multiple times in their
* life-cycle.</p>
* <p>Implementation detail: currently these plugins are instantiated on all nodes
