From eaf3789540d8975535fbceba49c8b14de2a73ac9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 27 Feb 2018 14:36:56 +0000 Subject: [PATCH] Polish "Set host when creating Jetty SSL connector" Closes gh-12120 --- .../embedded/jetty/JettyEmbeddedServletContainerFactory.java | 4 ++-- .../jetty/JettyEmbeddedServletContainerFactoryTests.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index d90fdb46903..6ec3274a2a8 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -700,8 +700,8 @@ public class JettyEmbeddedServletContainerFactory */ private interface SslServerConnectorFactory { - AbstractConnector createConnector(Server server, SslContextFactory sslContextFactory, - InetSocketAddress address); + AbstractConnector createConnector(Server server, + SslContextFactory sslContextFactory, InetSocketAddress address); } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index 529b72f8987..58ebaa52a3b 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -253,7 +253,8 @@ public class JettyEmbeddedServletContainerFactoryTests JettyEmbeddedServletContainerFactory factory = getFactory(); factory.setSsl(ssl); - factory.setAddress(InetAddress.getByAddress(InetAddress.getLocalHost().getAddress())); + factory.setAddress( + InetAddress.getByAddress(InetAddress.getLocalHost().getAddress())); this.container = factory.getEmbeddedServletContainer(); this.container.start();