aboutsummaryrefslogtreecommitdiffstats
path: root/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java
diff options
context:
space:
mode:
Diffstat (limited to 'standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java')
-rw-r--r--standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneContainerActivator.java6
1 files changed, 5 insertions, 1 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 04c3396c95c..baf0b41b270 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,7 +69,11 @@ public class StandaloneContainerActivator implements BundleActivator {
}
static List<ConnectorConfig> getConnectorConfigs(Container container) {
- return getConnectorConfigs(container.getHttpServer());
+ Http http = container.getHttp();
+
+ return (http == null) ?
+ getConnectorConfigs(container.getDefaultHttpServer()) :
+ getConnectorConfigs(http.getHttpServer());
}
private static List<ConnectorConfig> getConnectorConfigs(JettyHttpServer jettyHttpServer) {