Merge branch '2.2.x' into 2.3.x

Closes gh-23743
2020-10-19 10:25:24 +01:00 · 2020-10-19 10:25:24 +01:00 · e8187f9bb0
parent 11b5e86ffd 2a40bd7853
commit e8187f9bb0
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
@ -394,7 +394,6 @@ public class SpringApplication {
 	}

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

 	private void configureHeadlessProperty() {