Important: restrict PPC scanning to current context

pull/67/head
Dave Syer 11 years ago
parent 0df4156b57
commit 3879afccfb

@ -17,6 +17,7 @@
package org.springframework.boot.autoconfigure;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.SearchStrategy;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -36,7 +37,7 @@ import org.springframework.core.annotation.Order;
public class PropertyPlaceholderAutoConfiguration {
@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean(search = SearchStrategy.CURRENT)
public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer(
ApplicationContext context) {
return new PropertySourcesPlaceholderConfigurer();

Loading…
Cancel
Save