Merge branch '6.1.x'

2024-03-26 15:41:46 +01:00
parent f47352ff04 290a41d398
commit 2fea3d7921
88 changed files with 172 additions and 72 deletions
--- a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
@@ -65,6 +65,7 @@ public class LazyInitTargetSource extends AbstractBeanFactoryBasedTargetSource {


 	@Override
+	@Nullable
 	public synchronized Object getTarget() throws BeansException {
 		if (this.target == null) {
 			this.target = getBeanFactory().getBean(getTargetBeanName());