Tests: avoid NPE in JettySolrRunner lifeCycleStopped (#2337)

dsmiley · web-flow · commit 6697e8aa07ac · 2024-03-14T16:38:33.000-04:00
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
@@ -383,7 +383,9 @@ public void lifeCycleStopping(LifeCycle arg0) {}
 
             @Override
             public synchronized void lifeCycleStopped(LifeCycle arg0) {
-              coreContainerProvider.close();
+              if (coreContainerProvider != null) {
+                coreContainerProvider.close();
+              }
             }
 
             @Override

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,9 @@ public void lifeCycleStopping(LifeCycle arg0) {}`
`383`	`383`
`384`	`384`	`@Override`
`385`	`385`	`public synchronized void lifeCycleStopped(LifeCycle arg0) {`
`386`		`- coreContainerProvider.close();`
	`386`	`+ if (coreContainerProvider != null) {`
	`387`	`+ coreContainerProvider.close();`
	`388`	`+ }`
`387`	`389`	`}`
`388`	`390`
`389`	`391`	`@Override`