Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Tests: avoid NPE in JettySolrRunner lifeCycleStopped (#2337)

David Smiley6697e8aa07ac
diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
index 8fce258bbd3..edb7694abf1 100644
--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
@@ -383,7 +383,9 @@ public class JettySolrRunner {
@Override
public synchronized void lifeCycleStopped(LifeCycle arg0) {
- coreContainerProvider.close();
+ if (coreContainerProvider != null) {
+ coreContainerProvider.close();
+ }
}
@Override