Merge branch '6.2.x'

Author: sbrannen

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

@@ -225,18 +225,14 @@ public PropertySources getAppliedPropertySources() throws IllegalStateException
 	 */
 	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 @@ private static class ConfigurableEnvironmentPropertySource extends PropertySourc
 
 		@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 boolean containsProperty(String name) {
 
 		@Override
 		public String toString() {
-			return "ConfigurableEnvironmentPropertySource {propertySources=" + this.propertySources + "}";
+			return "ConfigurableEnvironmentPropertySource {propertySources=" + super.source.getPropertySources() + "}";
 		}
 	}