Merge branch '1.5.x' into 2.0.x

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -99,7 +99,7 @@
 		<jedis.version>2.9.1</jedis.version>
 		<jersey.version>2.26</jersey.version>
 		<jest.version>5.3.4</jest.version>
-		<jetty.version>9.4.12.v20180830</jetty.version>
+		<jetty.version>9.4.14.v20181114</jetty.version>
 		<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
 		<jetty-el.version>8.5.35.1</jetty-el.version>
 		<jmustache.version>1.14</jmustache.version>

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyWebServer.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.web.embedded.jetty;
 
+import java.io.IOException;
 import java.net.BindException;
 import java.util.Arrays;
 import java.util.List;
@@ -145,8 +146,9 @@ public class JettyWebServer implements WebServer {
 					try {
 						connector.start();
 					}
-					catch (BindException ex) {
+					catch (IOException ex) {
-						if (connector instanceof NetworkConnector) {
+						if (connector instanceof NetworkConnector
+								&& findBindException(ex) != null) {
 							throw new PortInUseException(
 									((NetworkConnector) connector).getPort());
 						}
@@ -169,6 +171,16 @@ public class JettyWebServer implements WebServer {
 		}
 	}
 
+	private BindException findBindException(Throwable ex) {
+		if (ex == null) {
+			return null;
+		}
+		if (ex instanceof BindException) {
+			return (BindException) ex;
+		}
+		return findBindException(ex.getCause());
+	}
+
 	private String getActualPortsDescription() {
 		StringBuilder ports = new StringBuilder();
 		for (Connector connector : this.server.getConnectors()) {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/ServletContextInitializerConfiguration.java

@@ -18,7 +18,6 @@ package org.springframework.boot.web.embedded.jetty;
 
 import javax.servlet.ServletException;
 
-import org.eclipse.jetty.util.component.AbstractLifeCycle;
 import org.eclipse.jetty.webapp.AbstractConfiguration;
 import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.WebAppContext;
@@ -50,54 +49,35 @@ public class ServletContextInitializerConfiguration extends AbstractConfiguratio
 
 	@Override
 	public void configure(WebAppContext context) throws Exception {
-		context.addBean(new Initializer(context), true);
-	}
-
-	/**
-	 * Jetty {@link AbstractLifeCycle} to call the {@link ServletContextInitializer
-	 * ServletContextInitializers}.
-	 */
-	private class Initializer extends AbstractLifeCycle {
-
-		private final WebAppContext context;
-
-		Initializer(WebAppContext context) {
-			this.context = context;
-		}
-
-		@Override
-		protected void doStart() throws Exception {
 		ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-			Thread.currentThread().setContextClassLoader(this.context.getClassLoader());
+		Thread.currentThread().setContextClassLoader(context.getClassLoader());
 		try {
-				callInitializers();
+			callInitializers(context);
 		}
 		finally {
 			Thread.currentThread().setContextClassLoader(classLoader);
 		}
 	}
 
-		private void callInitializers() throws ServletException {
+	private void callInitializers(WebAppContext context) throws ServletException {
 		try {
-				setExtendedListenerTypes(true);
+			setExtendedListenerTypes(context, true);
-				for (ServletContextInitializer initializer : ServletContextInitializerConfiguration.this.initializers) {
+			for (ServletContextInitializer initializer : this.initializers) {
-					initializer.onStartup(this.context.getServletContext());
+				initializer.onStartup(context.getServletContext());
 			}
 		}
 		finally {
-				setExtendedListenerTypes(false);
+			setExtendedListenerTypes(context, false);
 		}
 	}
 
-		private void setExtendedListenerTypes(boolean extended) {
+	private void setExtendedListenerTypes(WebAppContext context, boolean extended) {
 		try {
-				this.context.getServletContext().setExtendedListenerTypes(extended);
+			context.getServletContext().setExtendedListenerTypes(extended);
 		}
 		catch (NoSuchMethodError ex) {
 			// Not available on Jetty 8
 		}
 	}
 
-	}
-
 }