From 40cd277b7e26e135de71b80bec757b2022641815 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 17 Sep 2014 15:00:22 +0200
Subject: [PATCH] ReloadableResourceBundleMessageSource prevents accidental
 exposure of incomplete holder

Issue: SPR-12177
---
 .../support/ReloadableResourceBundleMessageSource.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
index c8d56691b7..3f650e1447 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
@@ -451,11 +451,11 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource
 	 */
 	protected PropertiesHolder getProperties(String filename) {
 		PropertiesHolder propHolder = this.cachedProperties.get(filename);
-		long originalTimestamp = -1;
+		long originalTimestamp = -2;
 
 		if (propHolder != null) {
 			originalTimestamp = propHolder.getRefreshTimestamp();
-			if (originalTimestamp < 0 || originalTimestamp > System.currentTimeMillis() - this.cacheMillis) {
+			if (originalTimestamp == -1 || originalTimestamp > System.currentTimeMillis() - this.cacheMillis) {
 				// Up to date
 				return propHolder;
 			}