diff --git a/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java index d633ec6867b..09fe5216714 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/DistributedUpdateProcessorTest.java @@ -65,7 +65,9 @@ public class DistributedUpdateProcessorTest extends SolrTestCaseJ4 { @AfterClass public static void AfterClass() { - executor.shutdown(); + if (null != executor) { // may not have inited due to lack of mockito + executor.shutdown(); + } System.clearProperty("enable.update.log"); }