aboutsummaryrefslogtreecommitdiffstats
path: root/standalone-container
diff options
context:
space:
mode:
authorArne Juul <arnej@yahoo-inc.com>2019-09-09 10:29:21 +0000
committerArne Juul <arnej@yahoo-inc.com>2019-09-09 10:29:21 +0000
commitd6467a231d8ada2f48a901b91a06abea7f28252a (patch)
tree2fc9d9bb4b77e2160aaf54d812ffdc4d179df348 /standalone-container
parent9ca5e1d4c5b60171195de135abc50309d0ca1aa4 (diff)
more robust container ports (second take)
This reverts commit 093f1c566cebbb2e635f679fb8b9f88a8227cc96.
Diffstat (limited to 'standalone-container')
-rw-r--r--standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java6
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) {