Close servers earlier in the shutdown process

3 files changed, 3 insertions, 5 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 932d31c0036..3aed7108f2b 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
@@ -284,13 +284,13 @@ public final class ConfiguredApplication implements Application {
         startShutdownDeadlineExecutor();
         shutdownReconfigurerThread();
 
-        configurer.shutdown(new Deconstructor(false));
-
         for (ServerProvider server : Container.get().getServerProviderRegistry().allComponents()) {
             if (startedServers.contains(server)) {
                 closeServer(server);
             }
         }
+
+        configurer.shutdown(new Deconstructor(false));
         Container.get().shutdown();
     }
 
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
index d39357fab46..b885a627d38 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
@@ -45,7 +45,7 @@ public class Deconstructor implements ComponentDeconstructor {
         } else if (component instanceof Provider) {
             // TODO Providers should most likely be deconstructed similarily to AbstractComponent
             log.info("Starting deconstruction of provider " + component);
-            ((Provider)component).deconstruct();
+            ((Provider<?>)component).deconstruct();
             log.info("Finished deconstruction of provider " + component);
         } else if (component instanceof SharedResource) {
             log.info("Releasing container reference to resource " + component);
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java
index 8ee51d403ae..f5f89eafbf1 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderTest.java
@@ -2,14 +2,12 @@
 package com.yahoo.container.jdisc.metric;
 
 import com.yahoo.jdisc.application.MetricConsumer;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assume.assumeTrue;
 
 /**
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a>