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

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2023-08-26 10:18:04 +02:00
parent 16cb296b35 2b3539a6de
commit 48878619d2
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -170,10 +170,19 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
}
}
processProperties(beanFactory, new PropertySourcesPropertyResolver(this.propertySources));
processProperties(beanFactory, createPropertyResolver(this.propertySources));
this.appliedPropertySources = this.propertySources;
}
/**
* Create a {@link ConfigurablePropertyResolver} for the specified property sources.
* @param propertySources the property sources to use
* @since 6.0.12
*/
protected ConfigurablePropertyResolver createPropertyResolver(MutablePropertySources propertySources){
return new PropertySourcesPropertyResolver(propertySources);
}
/**
* Visit each bean definition in the given bean factory and attempt to replace ${...} property
* placeholders with values from the given properties.