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

Merge branch '6.2.x'

This commit is contained in:
Sam Brannen 2025-05-11 15:37:07 +02:00
parent c28b22b465 7135527765
commit 74f4a07eac
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java
View File

@ -225,18 +225,14 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
*/
private static class ConfigurableEnvironmentPropertySource extends PropertySource<ConfigurableEnvironment> {
private final PropertySources propertySources;
ConfigurableEnvironmentPropertySource(ConfigurableEnvironment environment) {
super(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, environment);
this.propertySources = environment.getPropertySources();
}
@Override
public @Nullable Object getProperty(String name) {
for (PropertySource<?> propertySource : this.propertySources) {
for (PropertySource<?> propertySource : super.source.getPropertySources()) {
Object candidate = propertySource.getProperty(name);
if (candidate != null) {
return candidate;
@ -247,7 +243,7 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
@Override
public boolean containsProperty(String name) {
for (PropertySource<?> propertySource : this.propertySources) {
for (PropertySource<?> propertySource : super.source.getPropertySources()) {
if (propertySource.containsProperty(name)) {
return true;
}
@ -257,7 +253,7 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
@Override
public String toString() {
return "ConfigurableEnvironmentPropertySource {propertySources=" + this.propertySources + "}";
return "ConfigurableEnvironmentPropertySource {propertySources=" + super.source.getPropertySources() + "}";
}
}