Skip to content

S
spring-boot
Commit e8187f9b authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.2.x' into 2.3.x 

Closes gh-23743
parents 11b5e86f 2a40bd78
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View file @ e8187f9b
...@@ -394,7 +394,6 @@ public class SpringApplication { ...@@ -394,7 +394,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();
...@@ -403,6 +402,7 @@ public class SpringApplication { ...@@ -403,6 +402,7 @@ public class SpringApplication {
// Not allowed in some environments. // Not allowed in some environments.
} }
} }
refresh((ApplicationContext) context);
} }
private void configureHeadlessProperty() { private void configureHeadlessProperty() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment