Merge branch '1.5.x'

2017-05-23 22:03:17 +01:00
parent bbc82cb621 19a61c6591
commit e8170cf00d
1 changed files with 1 additions and 0 deletions
--- 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();