Merge branch '1.1.x'

10 years ago · 04c2e25a27
parent 0b72b9814f 0ff511d978
commit 04c2e25a27
1 changed files with 2 additions and 2 deletions
--- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@ -332,7 +332,7 @@ public class SpringApplication {
 			}
 			return context;
 		}
-		catch (Exception ex) {
+		catch (Throwable ex) {
 			try {
 				for (SpringApplicationRunListener runListener : runListeners) {
 					finishWithException(runListener, context, ex);
@ -697,7 +697,7 @@ public class SpringApplication {
 	}

 	private void finishWithException(SpringApplicationRunListener runListener,
-			ConfigurableApplicationContext context, Exception exception) {
+			ConfigurableApplicationContext context, Throwable exception) {
 		try {
 			runListener.finished(context, exception);
 		}