Merge branch '1.5.x'

e8170cf0 · Andy Wilkinson · bbc82cb6 · 19a61c65 · e8170cf0
Commit e8170cf0 authored May 23, 2017 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

JettyServletWebServerFactoryTests.java ...web/embedded/jetty/JettyServletWebServerFactoryTests.java +1 -0

No files found.
--- a/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java
@@ -290,6 +290,7 @@ public class JettyServletWebServerFactoryTests
 				threadPool.setMaxThreads(2);
 				threadPool.setMinThreads(2);
 			}
+
 		});
 		this.thrown.expectCause(instanceOf(IllegalStateException.class));
 		factory.getWebServer().start();