Skip to content

Commit d4ecd97

Browse files
committed
Fix compile issues introduced by merge
The build was broken due to some issues with the merging of elastic#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.
1 parent 305bfea commit d4ecd97

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/nio/SecurityNioHttpServerTransport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public SecurityNioHttpServerTransport(Settings settings, NetworkService networkS
5959
this.sslEnabled = HTTP_SSL_ENABLED.get(settings);
6060
this.sslService = sslService;
6161
if (sslEnabled) {
62-
this.sslConfiguration = sslService.sslConfiguration(SSLService.getHttpTransportSSLSettings(settings), Settings.EMPTY);
62+
this.sslConfiguration = sslService.getHttpTransportSSLConfiguration();
6363
if (sslService.isConfigurationValidForServerUsage(sslConfiguration) == false) {
6464
throw new IllegalArgumentException("a key must be provided to run as a server. the key should be configured using the " +
6565
"[xpack.security.http.ssl.key] or [xpack.security.http.ssl.keystore.path] setting");

0 commit comments

Comments
 (0)