Browse Source

Rename determineResource() to resolveResource()

See gh-30369
pull/30375/head
Sam Brannen 2 years ago
parent
commit
982a094646
  1. 6
      spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java

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

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

Loading…
Cancel
Save