Merge branch '2.3.x'

Closes gh-23744
pull/23755/head
Andy Wilkinson 4 years ago
commit 01077d8ced

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

Loading…
Cancel
Save