From d4ecd97d9fd8974fd8696808dbd5bccf76939ebf Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Fri, 13 Jul 2018 23:26:33 -0600 Subject: [PATCH] Fix compile issues introduced by merge The build was broken due to some issues with the merging of #32018. A method that was public went private before the PR was merged. That did not cause a merge conflict (so the PR was merged successfully). But it did cause the build to fail. --- .../security/transport/nio/SecurityNioHttpServerTransport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/nio/SecurityNioHttpServerTransport.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/nio/SecurityNioHttpServerTransport.java index 006c78b4ae0de..50a78d93c71b8 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/nio/SecurityNioHttpServerTransport.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/nio/SecurityNioHttpServerTransport.java @@ -59,7 +59,7 @@ public SecurityNioHttpServerTransport(Settings settings, NetworkService networkS this.sslEnabled = HTTP_SSL_ENABLED.get(settings); this.sslService = sslService; if (sslEnabled) { - this.sslConfiguration = sslService.sslConfiguration(SSLService.getHttpTransportSSLSettings(settings), Settings.EMPTY); + this.sslConfiguration = sslService.getHttpTransportSSLConfiguration(); if (sslService.isConfigurationValidForServerUsage(sslConfiguration) == false) { throw new IllegalArgumentException("a key must be provided to run as a server. the key should be configured using the " + "[xpack.security.http.ssl.key] or [xpack.security.http.ssl.keystore.path] setting");