root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Lite configuration candidate check defensively handles method introspection failure 

Issue: SPR-13091
This commit is contained in:
Juergen Hoeller 2015-06-02 14:18:00 +02:00
parent 8c337a48a9
commit 4f1286a4c3
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
View File

@ -161,12 +161,24 @@ abstract class ConfigurationClassUtils {
if (metadata.isInterface()) { if (metadata.isInterface()) {
return false; return false;
} }
// Any of the typical annotations found?
for (String indicator : candidateIndicators) { for (String indicator : candidateIndicators) {
if (metadata.isAnnotated(indicator)) { if (metadata.isAnnotated(indicator)) {
return true; return true;
} }
} }
return metadata.hasAnnotatedMethods(Bean.class.getName());
// Finally, let's look for @Bean methods...
try {
return metadata.hasAnnotatedMethods(Bean.class.getName());
}
catch (Throwable ex) {
if (logger.isDebugEnabled()) {
logger.debug("Failed to introspect @Bean methods on class [" + metadata.getClass() + "]: " + ex);
}
return false;
}
} }
/** /**