diff options
Diffstat (limited to 'configserver')
2 files changed, 3 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java index aa709b3bf37..7ccdf161f82 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java @@ -78,9 +78,9 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer { } @Override - public void close() { + public void awaitShutdown() { connectionPool.close(); - super.close(); + super.awaitShutdown(); } private void createLocalSessionIfMissing(ApplicationId applicationId, long sessionId) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java index fa82744de90..837f025ec2b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java @@ -5,7 +5,6 @@ import com.google.inject.Inject; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.component.AbstractComponent; import com.yahoo.concurrent.maintenance.Maintainer; -import com.yahoo.jdisc.Metric; import com.yahoo.vespa.config.server.ApplicationRepository; import com.yahoo.vespa.config.server.ConfigServerBootstrap; import com.yahoo.vespa.config.server.application.ConfigConvergenceChecker; @@ -47,7 +46,7 @@ public class ConfigServerMaintenance extends AbstractComponent { @Override public void deconstruct() { maintainers.forEach(Maintainer::shutdown); - maintainers.forEach(Maintainer::close); + maintainers.forEach(Maintainer::awaitShutdown); } /* |