Merge branch '2.3.x'

Closes gh-23744
4 years ago · 01077d8ced
parent c0dddf7e23 e8187f9bb0
commit 01077d8ced
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@ -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() {