summaryrefslogtreecommitdiffstats
path: root/standalone-container
diff options
context:
space:
mode:
authorArne Juul <arnej@yahoo-inc.com>2019-09-03 13:07:56 +0000
committerArne Juul <arnej@yahoo-inc.com>2019-09-04 11:07:17 +0000
commitff7778ebb098d1717b654f5bb6ed2489e824ec94 (patch)
tree49f81e97466c465163af0b6e7efe16739a84bf8a /standalone-container
parentd71937c4f9f3c7b69d6d39cbac1ccdce23df3abe (diff)
* try rewriting container port allocation
* simplify access to defaultHttpServer
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) {