Merge branch '2.3.x' into 2.4.x

Closes gh-25174
spring-projects · Feb 10, 2021 · 9da3b65 · 9da3b65
2 parents 46bc551 + 708cbd7
commit 9da3b65
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/...n/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java b/...n/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java
@@ -36,6 +36,7 @@
 import org.springframework.boot.autoconfigure.jdbc.DataSourceSchemaCreatedEvent;
 import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -136,12 +137,17 @@ private boolean isInitializingDatabase(DataSource dataSource) {
 	 * blocks until any asynchronous DataSource initialization has completed.
 	 */
 	static class DataSourceInitializationCompletionListener
-			implements ApplicationListener<ContextRefreshedEvent>, Ordered {
+			implements ApplicationListener<ContextRefreshedEvent>, Ordered, ApplicationContextAware {
+
+		private volatile ApplicationContext applicationContext;
 
 		private volatile Future<?> dataSourceInitialization;
 
 		@Override
 		public void onApplicationEvent(ContextRefreshedEvent event) {
+			if (!event.getApplicationContext().equals(this.applicationContext)) {
+				return;
+			}
 			Future<?> dataSourceInitialization = this.dataSourceInitialization;
 			if (dataSourceInitialization != null) {
 				try {
@@ -158,6 +164,11 @@ public int getOrder() {
 			return Ordered.HIGHEST_PRECEDENCE;
 		}
 
+		@Override
+		public void setApplicationContext(ApplicationContext applicationContext) {
+			this.applicationContext = applicationContext;
+		}
+
 	}
 
 	/**