diff options
author | Olli Virtanen <olli.virtanen@oath.com> | 2018-07-03 13:37:56 +0200 |
---|---|---|
committer | Olli Virtanen <olli.virtanen@oath.com> | 2018-07-03 13:37:56 +0200 |
commit | b266657d52b30d926b40292d46e872cb1252ac60 (patch) | |
tree | aa2ef836b5a7b7874b886e234d1d97fcc0a0a6c9 /container-disc | |
parent | ac35474116eeae036bab468a4314ed3d7295a6e6 (diff) |
Close servers earlier in the shutdown process
Diffstat (limited to 'container-disc')
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> |