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

Merge pull request #64 from marschall/SPR-9316

Browse Source 
* SPR-9316:
  Avoid NPE in AutowiredAnnotationBeanPostProcessor
This commit is contained in:
Chris Beams
2012-05-16 11:48:07 +03:00
parent b50f6e19a6 2624b90906
commit 46bdb2de07
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2011 the original author or authors. * Copyright 2002-2012 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -405,10 +405,16 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
protected boolean determineRequiredStatus(Annotation annotation) { protected boolean determineRequiredStatus(Annotation annotation) {
try { try {
Method method = ReflectionUtils.findMethod(annotation.annotationType(), this.requiredParameterName); Method method = ReflectionUtils.findMethod(annotation.annotationType(), this.requiredParameterName);
if (method == null) {
// annotations like @Inject, @Value and @Resource don't have a method
// (attribute) named "required" -> default to required status
return true;
}
return (this.requiredParameterValue == (Boolean) ReflectionUtils.invokeMethod(method, annotation)); return (this.requiredParameterValue == (Boolean) ReflectionUtils.invokeMethod(method, annotation));
} }
catch (Exception ex) { catch (Exception ex) {
// required by default // an exception was thrown during reflective invocation of the required
// attribute -> default to required status
return true; return true;
} }
} }