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

ReloadableResourceBundleMessageSource prevents accidental exposure of incomplete holder 

Issue: SPR-12177
This commit is contained in:
Juergen Hoeller 2014-09-17 15:00:22 +02:00
parent 0cf472b111
commit 40cd277b7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,11 +451,11 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource
*/ */
protected PropertiesHolder getProperties(String filename) { protected PropertiesHolder getProperties(String filename) {
PropertiesHolder propHolder = this.cachedProperties.get(filename); PropertiesHolder propHolder = this.cachedProperties.get(filename);
long originalTimestamp = -1; long originalTimestamp = -2;
if (propHolder != null) { if (propHolder != null) {
originalTimestamp = propHolder.getRefreshTimestamp(); originalTimestamp = propHolder.getRefreshTimestamp();
if (originalTimestamp < 0 || originalTimestamp > System.currentTimeMillis() - this.cacheMillis) { if (originalTimestamp == -1 || originalTimestamp > System.currentTimeMillis() - this.cacheMillis) {
// Up to date // Up to date
return propHolder; return propHolder;
} }