Merge branch '2.3.x'

Closes gh-23744
This commit is contained in:
Andy Wilkinson
2020-10-19 10:25:50 +01:00

View File

@@ -415,7 +415,6 @@ public class SpringApplication {
}
private void refreshContext(ConfigurableApplicationContext context) {
refresh((ApplicationContext) context);
if (this.registerShutdownHook) {
try {
context.registerShutdownHook();
@@ -424,6 +423,7 @@ public class SpringApplication {
// Not allowed in some environments.
}
}
refresh((ApplicationContext) context);
}
private void configureHeadlessProperty() {