diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-09 11:30:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 11:30:20 +0200 |
| commit | 093f1c566cebbb2e635f679fb8b9f88a8227cc96 (patch) | |
| tree | 9ae65864c5c35c6ef2e02f1bb93baba6ff96cca1 /standalone-container | |
| parent | 6648f89d562f732972df42214e7b0895edf04659 (diff) | |
Revert "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, 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) { |