Merge branch '1.2.x'

2015-10-16 10:42:26 +01:00
parent 874cd3390e 35a3f4a1c0
commit f8cffd745c
3 changed files with 7 additions and 6 deletions
--- a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
@@ -82,7 +82,6 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
 			throws Exception {
 		assertValidAnnotations(config.getTestClass());
 		SpringApplication application = getSpringApplication();
-		application.setRegisterShutdownHook(false);
 		application.setMainApplicationClass(config.getTestClass());
 		application.setSources(getSources(config));
 		ConfigurableEnvironment environment = new StandardEnvironment();