Merge branch '1.1.x'

This commit is contained in:
Dave Syer 2014-10-01 15:51:59 +01:00
commit 04c2e25a27
1 changed files with 2 additions and 2 deletions

View File

@ -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);
}