diff options
| -rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index aa70bd8197f..a27b082f014 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -434,7 +434,9 @@ public final class ConfiguredApplication implements Application { @Override public void destroy() { log.info("Destroy: Shutting down container now"); - configurer.shutdown(); + if (configurer != null) { + configurer.shutdown(); + } slobrokConfigSubscriber.ifPresent(SlobrokConfigSubscriber::shutdown); Container.get().shutdown(); unregisterInSlobrok(); |