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

Check factory method metadata to avoid NPE in devtools condition

Browse Source 
Closes gh-6056
This commit is contained in:
Martin Lippert
2016-05-27 16:09:21 +02:00
committed by Andy Wilkinson
parent f3e9f1e6e3
commit efd541d26b
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java
View File

@@ -140,6 +140,8 @@ public class DevToolsDataSourceAutoConfiguration {
BeanDefinition dataSourceDefinition = context.getRegistry()
.getBeanDefinition(dataSourceBeanNames[0]);
if (dataSourceDefinition instanceof AnnotatedBeanDefinition
&& ((AnnotatedBeanDefinition) dataSourceDefinition)
.getFactoryMethodMetadata() != null
&& ((AnnotatedBeanDefinition) dataSourceDefinition)
.getFactoryMethodMetadata().getDeclaringClassName()
.startsWith(DataSourceAutoConfiguration.class.getName())) {