Merge branch '2.2.x' into 2.3.x

Closes gh-23743

Merge branch '2.2.x' into 2.3.x
Closes gh-23743
e8187f9b · Andy Wilkinson · 11b5e86f · 2a40bd78 · e8187f9b
Commit e8187f9b authored Oct 19, 2020 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

SpringApplication.java ...main/java/org/springframework/boot/SpringApplication.java +1 -1

No files found.
--- 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() {