Consistently propagate ApplicationStartup to BeanFactory

Closes gh-32747 (cherry picked from commit 25cedcf)
spring-projects · May 1, 2024 · 924b684 · 924b684
1 parent a48e2f3
commit 924b684
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...ng-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/...ng-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -1080,7 +1080,7 @@ public void setSecurityContextProvider(SecurityContextProvider securityProvider)
 
 	@Override
 	public void setApplicationStartup(ApplicationStartup applicationStartup) {
-		Assert.notNull(applicationStartup, "applicationStartup should not be null");
+		Assert.notNull(applicationStartup, "ApplicationStartup must not be null");
 		this.applicationStartup = applicationStartup;
 	}
 

diff --git a/.../main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java b/.../main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,6 +126,7 @@ protected final void refreshBeanFactory() throws BeansException {
 		try {
 			DefaultListableBeanFactory beanFactory = createBeanFactory();
 			beanFactory.setSerializationId(getId());
+			beanFactory.setApplicationStartup(getApplicationStartup());
 			customizeBeanFactory(beanFactory);
 			loadBeanDefinitions(beanFactory);
 			this.beanFactory = beanFactory;