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

Merge branch '1.3.x'

This commit is contained in:
Andy Wilkinson 2016-02-04 13:52:21 +00:00
parent 34a864447f c0a2c88da1
commit 8f57f4ca63
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 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.
@ -25,6 +25,7 @@ import groovy.lang.Closure;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader; import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader;
import org.springframework.beans.factory.support.BeanDefinitionReader;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.beans.factory.support.BeanNameGenerator;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@ -60,7 +61,7 @@ class BeanDefinitionLoader {
private final XmlBeanDefinitionReader xmlReader; private final XmlBeanDefinitionReader xmlReader;
private GroovyBeanDefinitionReader groovyReader; private BeanDefinitionReader groovyReader;
private final ClassPathBeanDefinitionScanner scanner; private final ClassPathBeanDefinitionScanner scanner;
@ -162,7 +163,7 @@ class BeanDefinitionLoader {
private int load(GroovyBeanDefinitionSource source) { private int load(GroovyBeanDefinitionSource source) {
int before = this.xmlReader.getRegistry().getBeanDefinitionCount(); int before = this.xmlReader.getRegistry().getBeanDefinitionCount();
this.groovyReader.beans(source.getBeans()); ((GroovyBeanDefinitionReader) this.groovyReader).beans(source.getBeans());
int after = this.xmlReader.getRegistry().getBeanDefinitionCount(); int after = this.xmlReader.getRegistry().getBeanDefinitionCount();
return after - before; return after - before;
} }