From aa9945c86c15809042ab30d7d4bf7aebea714e7b Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 17 Dec 2018 11:17:11 +0000
Subject: [PATCH] Upgrade to Jetty 9.4.14.v20181114

Closes gh-15239
---
 spring-boot-dependencies/pom.xml              |  2 +-
 .../jetty/JettyEmbeddedServletContainer.java  | 16 ++++-
 ...ervletContextInitializerConfiguration.java | 64 +++++++------------
 3 files changed, 37 insertions(+), 45 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 8f91d17d3f3f..57261f609fbd 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -111,7 +111,7 @@
 		<jedis.version>2.9.0</jedis.version>
 		<jersey.version>2.25.1</jersey.version>
 		<jest.version>2.0.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.0.33</jetty-el.version>
 		<jms-api.version>1.1-rev-1</jms-api.version>
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java
index 71a6d0edc9a4..32bf23199369 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.context.embedded.jetty;
 
+import java.io.IOException;
 import java.net.BindException;
 import java.util.List;
 
@@ -142,8 +143,9 @@ public void start() throws EmbeddedServletContainerException {
 					try {
 						connector.start();
 					}
-					catch (BindException ex) {
-						if (connector instanceof NetworkConnector) {
+					catch (IOException ex) {
+						if (connector instanceof NetworkConnector
+								&& findBindException(ex) != null) {
 							throw new PortInUseException(
 									((NetworkConnector) connector).getPort());
 						}
@@ -166,6 +168,16 @@ public void start() throws EmbeddedServletContainerException {
 		}
 	}
 
+	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()) {
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java
index 4e61ed5fdede..b0add660221b 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/ServletContextInitializerConfiguration.java
@@ -18,7 +18,6 @@
 
 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;
@@ -49,54 +48,35 @@ public ServletContextInitializerConfiguration(
 
 	@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;
+		ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+		Thread.currentThread().setContextClassLoader(context.getClassLoader());
+		try {
+			callInitializers(context);
 		}
-
-		@Override
-		protected void doStart() throws Exception {
-			ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-			Thread.currentThread().setContextClassLoader(this.context.getClassLoader());
-			try {
-				callInitializers();
-			}
-			finally {
-				Thread.currentThread().setContextClassLoader(classLoader);
-			}
+		finally {
+			Thread.currentThread().setContextClassLoader(classLoader);
 		}
+	}
 
-		private void callInitializers() throws ServletException {
-			try {
-				setExtendedListenerTypes(true);
-				for (ServletContextInitializer initializer : ServletContextInitializerConfiguration.this.initializers) {
-					initializer.onStartup(this.context.getServletContext());
-				}
-			}
-			finally {
-				setExtendedListenerTypes(false);
+	private void callInitializers(WebAppContext context) throws ServletException {
+		try {
+			setExtendedListenerTypes(context, true);
+			for (ServletContextInitializer initializer : this.initializers) {
+				initializer.onStartup(context.getServletContext());
 			}
 		}
-
-		private void setExtendedListenerTypes(boolean extended) {
-			try {
-				this.context.getServletContext().setExtendedListenerTypes(extended);
-			}
-			catch (NoSuchMethodError ex) {
-				// Not available on Jetty 8
-			}
+		finally {
+			setExtendedListenerTypes(context, false);
 		}
+	}
 
+	private void setExtendedListenerTypes(WebAppContext context, boolean extended) {
+		try {
+			context.getServletContext().setExtendedListenerTypes(extended);
+		}
+		catch (NoSuchMethodError ex) {
+			// Not available on Jetty 8
+		}
 	}
 
 }