From dc1e1e82804cf76792ba3c9a3846e3615a55beb1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 2 Feb 2018 14:48:06 +0000 Subject: [PATCH] =?UTF-8?q?Polish=20=E2=80=9CPrevent=20reverse=20name=20lo?= =?UTF-8?q?okup=20when=20configuring=20Jetty's=20address=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes gh-11889 --- .../JettyEmbeddedServletContainerFactory.java | 2 +- ...yEmbeddedServletContainerFactoryTests.java | 30 +++++-------------- 2 files changed, 9 insertions(+), 23 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 2be9c21a26..a797232f79 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 7faf6652e5..5403f2b28d 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 @@ -36,7 +36,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.jasper.servlet.JspServlet; -import org.eclipse.jetty.server.AbstractNetworkConnector; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; @@ -120,27 +119,14 @@ public class JettyEmbeddedServletContainerFactoryTests @Test public void specificIPAddressNotReverseResolved() throws Exception { JettyEmbeddedServletContainerFactory factory = getFactory(); - final String[] refAncHost = new String[1]; - refAncHost[0] = "HostNotSetInAbstractNetworkConnector"; - InetAddress lhAddress = InetAddress.getLocalHost(); - InetAddress address = InetAddress.getByAddress(lhAddress.getAddress()); - // the address should have no host name associated with ith - String expectedHost = address.getHostAddress(); - factory.setAddress(address); - factory.addServerCustomizers(server -> { - for (Connector connector : server.getConnectors()) { - if (connector instanceof AbstractNetworkConnector) { - @SuppressWarnings("resource") - AbstractNetworkConnector anc = (AbstractNetworkConnector) connector; - String ancHost = anc.getHost(); - refAncHost[0] = ancHost; - break; - } - } - }); - this.container = factory - .getEmbeddedServletContainer(exampleServletRegistration()); - assertThat(refAncHost[0]).isEqualTo(expectedHost); + InetAddress localhost = InetAddress.getLocalHost(); + factory.setAddress(InetAddress.getByAddress(localhost.getAddress())); + this.container = factory.getEmbeddedServletContainer(); + this.container.start(); + Connector connector = ((JettyEmbeddedServletContainer) this.container).getServer() + .getConnectors()[0]; + assertThat(((ServerConnector) connector).getHost()) + .isEqualTo(localhost.getHostAddress()); } @Test