From 093f1c566cebbb2e635f679fb8b9f88a8227cc96 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Mon, 9 Sep 2019 11:30:20 +0200
Subject: Revert "Arnej/more robust container ports"

---
 .../yahoo/container/standalone/StandaloneContainerActivator.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'standalone-container/src')

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) {
-- 
cgit v1.2.3