Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure SpringApplication closes its ApplicationContext

Browse Source 
...even if the CommandLineRunners fail and we drop to the error
handling path.

Fixes gh-211
This commit is contained in:
Dave Syer
2014-01-11 07:38:17 +00:00
parent 420fc69983
commit c349cb66ba
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -360,18 +360,25 @@ public class SpringApplication {
return context;
}
catch (RuntimeException ex) {
multicaster.multicastEvent(new SpringApplicationErrorEvent(this, context,
args, ex));
handleError(context, multicaster, ex, args);
throw ex;
}
catch (Error ex) {
multicaster.multicastEvent(new SpringApplicationErrorEvent(this, context,
args, ex));
handleError(context, multicaster, ex, args);
throw ex;
}
}
protected void handleError(ConfigurableApplicationContext context,
ApplicationEventMulticaster multicaster, Throwable ex, String... args) {
multicaster.multicastEvent(new SpringApplicationErrorEvent(this, context, args,
ex));
if (context != null) {
context.close();
}
}
private void registerListeners(ApplicationEventMulticaster multicaster,
Set<Object> sources) {
for (Object object : sources) {