Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE in case of @Lazy @Autowired(required=false)

Browse Source 
Issue: SPR-13967
This commit is contained in:
Juergen Hoeller
2016-02-22 23:21:59 +01:00
parent d8a05592e2
commit b9fe6d89da
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spring-context/src/test/java/org/springframework/context/annotation/LazyAutowiredAnnotationBeanPostProcessorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2016 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.
@@ -118,6 +118,28 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests {
}
}
@Test
public void testLazyOptionalResourceInjectionWithNonExistingTarget() {
DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
bf.setAutowireCandidateResolver(new ContextAnnotationAutowireCandidateResolver());
AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
bpp.setBeanFactory(bf);
bf.addBeanPostProcessor(bpp);
RootBeanDefinition bd = new RootBeanDefinition(OptionalFieldResourceInjectionBean.class);
bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
bf.registerBeanDefinition("annotatedBean", bd);
OptionalFieldResourceInjectionBean bean = (OptionalFieldResourceInjectionBean) bf.getBean("annotatedBean");
assertNotNull(bean.getTestBean());
try {
bean.getTestBean().getName();
fail("Should have thrown NoSuchBeanDefinitionException");
}
catch (NoSuchBeanDefinitionException ex) {
// expected;
}
}
public interface TestBeanHolder {
@@ -136,6 +158,17 @@ public class LazyAutowiredAnnotationBeanPostProcessorTests {
}
public static class OptionalFieldResourceInjectionBean implements TestBeanHolder {
@Autowired(required = false) @Lazy
private TestBean testBean;
public TestBean getTestBean() {
return this.testBean;
}
}
public static class FieldResourceInjectionBeanWithCompositeAnnotation implements TestBeanHolder {
@LazyInject