diff options
| author | Jon Bratseth <bratseth@oath.com> | 2019-09-09 10:07:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 10:07:27 +0200 |
| commit | f5b178aa7a04d653b30e440eeb6e13097267937d (patch) | |
| tree | c378988c0dfdd81753bbbcb88ea0ee1f37e2da4b /standalone-container | |
| parent | 2774561e5637922a5950440d9d2136939103285a (diff) | |
| parent | cb2ed803e63227648b6d770694ace1b9d3b5dd0d (diff) | |
Merge pull request #10556 from vespa-engine/arnej/more-robust-container-ports
Arnej/more robust container ports
Diffstat (limited to 'standalone-container')
| -rw-r--r-- | standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java index baf0b41b270..04c3396c95c 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java @@ -69,11 +69,7 @@ public class StandaloneContainerActivator implements BundleActivator { } static List<ConnectorConfig> getConnectorConfigs(Container container) { - Http http = container.getHttp(); - - return (http == null) ? - getConnectorConfigs(container.getDefaultHttpServer()) : - getConnectorConfigs(http.getHttpServer()); + return getConnectorConfigs(container.getHttpServer()); } private static List<ConnectorConfig> getConnectorConfigs(JettyHttpServer jettyHttpServer) { |