From 3879afccfb2ceae0fce063ed6334508fe03dda39 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 1 Oct 2013 08:30:15 -0400 Subject: [PATCH] Important: restrict PPC scanning to current context --- .../autoconfigure/PropertyPlaceholderAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java index f382219707d..1ce31b6e957 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/PropertyPlaceholderAutoConfiguration.java @@ -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();