Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source 
# Conflicts:
#	framework-platform/framework-platform.gradle
This commit is contained in:
Juergen Hoeller
2025-05-13 16:31:05 +02:00
parent 0df75ff75e 73f1c5a189
commit 254a55d217
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,6 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
super(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, environment);
}
@Override
public boolean containsProperty(String name) {
for (PropertySource<?> propertySource : super.source.getPropertySources()) {
@@ -257,6 +256,7 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
}
}
/**
* Fallback {@link PropertySource} that delegates to a raw {@link Environment}.
* <p>Should never apply in a regular scenario, since the {@code Environment}
@@ -269,7 +269,6 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
super(ENVIRONMENT_PROPERTIES_PROPERTY_SOURCE_NAME, environment);
}
@Override
public boolean containsProperty(String name) {
return super.source.containsProperty(name);