Ensure that Jetty is completely stopped when it fails to start

Closes spring-projectsgh-12735
michalfotyga · Apr 3, 2018 · 30de75c · 30de75c
1 parent 399455f
commit 30de75c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...n/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java b/...n/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.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.
@@ -155,9 +155,11 @@ public void start() throws EmbeddedServletContainerException {
 						.info("Jetty started on port(s) " + getActualPortsDescription());
 			}
 			catch (EmbeddedServletContainerException ex) {
+				stopSilently();
 				throw ex;
 			}
 			catch (Exception ex) {
+				stopSilently();
 				throw new EmbeddedServletContainerException(
 						"Unable to start embedded Jetty servlet container", ex);
 			}

diff --git a/...pringframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/...pringframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
@@ -357,7 +357,16 @@ public void destroy() {
 
 		});
 		this.thrown.expect(EmbeddedServletContainerException.class);
-		factory.getEmbeddedServletContainer().start();
+		JettyEmbeddedServletContainer jettyContainer = (JettyEmbeddedServletContainer) factory
+				.getEmbeddedServletContainer();
+		try {
+			jettyContainer.start();
+		}
+		finally {
+			QueuedThreadPool threadPool = (QueuedThreadPool) jettyContainer.getServer()
+					.getThreadPool();
+			assertThat(threadPool.isRunning()).isFalse();
+		}
 	}
 
 	@Test