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

Rename determineResource() to resolveResource() 

See gh-30369
This commit is contained in:
Sam Brannen 2023-04-25 11:35:00 +02:00
parent dfe320f172
commit 982a094646
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
View File

@ -404,12 +404,12 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
* (potentially getting re-validated against the current last-modified timestamp).
* @param filename the bundle filename (basename + Locale)
* @param propHolder the current PropertiesHolder for the bundle
* @see #determineResource(String)
* @see #resolveResource(String)
*/
protected PropertiesHolder refreshProperties(String filename, @Nullable PropertiesHolder propHolder) {
long refreshTimestamp = (getCacheMillis() < 0 ? -1 : System.currentTimeMillis());
Resource resource = determineResource(filename);
Resource resource = resolveResource(filename);
if (resource.exists()) {
long fileTimestamp = -1;
if (getCacheMillis() >= 0) {
@ -490,7 +490,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
* @return the {@code Resource} to use
* @since 6.1
*/
protected Resource determineResource(String filename) {
protected Resource resolveResource(String filename) {
Resource propertiesResource = this.resourceLoader.getResource(filename + PROPERTIES_SUFFIX);
if (propertiesResource.exists()) {
return propertiesResource;