root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

This commit is contained in:
Dave Syer 2014-10-01 15:51:59 +01:00
parent 0b72b9814f 0ff511d978
commit 04c2e25a27
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@ -332,7 +332,7 @@ public class SpringApplication {
} }
return context; return context;
} }
catch (Exception ex) { catch (Throwable ex) {
try { try {
for (SpringApplicationRunListener runListener : runListeners) { for (SpringApplicationRunListener runListener : runListeners) {
finishWithException(runListener, context, ex); finishWithException(runListener, context, ex);
@ -697,7 +697,7 @@ public class SpringApplication {
} }
private void finishWithException(SpringApplicationRunListener runListener, private void finishWithException(SpringApplicationRunListener runListener,
ConfigurableApplicationContext context, Exception exception) { ConfigurableApplicationContext context, Throwable exception) {
try { try {
runListener.finished(context, exception); runListener.finished(context, exception);
} }