mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.2.x'
Closes gh-40983
This commit is contained in:
commit
70946b7f2f
@ -87,7 +87,7 @@ public final class ConfigurationPropertySources {
|
|||||||
Assert.isInstanceOf(ConfigurableEnvironment.class, environment);
|
Assert.isInstanceOf(ConfigurableEnvironment.class, environment);
|
||||||
MutablePropertySources sources = ((ConfigurableEnvironment) environment).getPropertySources();
|
MutablePropertySources sources = ((ConfigurableEnvironment) environment).getPropertySources();
|
||||||
PropertySource<?> attached = getAttached(sources);
|
PropertySource<?> attached = getAttached(sources);
|
||||||
if (attached == null || !isUsingSources(attached, sources)) {
|
if (!isUsingSources(attached, sources)) {
|
||||||
attached = new ConfigurationPropertySourcesPropertySource(ATTACHED_PROPERTY_SOURCE_NAME,
|
attached = new ConfigurationPropertySourcesPropertySource(ATTACHED_PROPERTY_SOURCE_NAME,
|
||||||
new SpringConfigurationPropertySources(sources));
|
new SpringConfigurationPropertySources(sources));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user