From d820d9738e9c9261a2805188fabf08c95fd96ced Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 8 Jun 2013 22:00:22 +0200
Subject: [PATCH] make sure the date is in the past

---
 .../java/com/commafeed/backend/feeds/FeedParser.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feeds/FeedParser.java b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
index 1268af3b..87150bd6 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedParser.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
@@ -160,11 +160,16 @@ public class FeedParser {
 	}
 
 	private Date validateDate(Date date) {
+		Date now = Calendar.getInstance().getTime();
 		if (date == null) {
-			return new Date();
+			return now;
 		}
 		if (date.before(START) || date.after(END)) {
-			return new Date();
+			return now;
+		}
+
+		if (date.after(now)) {
+			return now;
 		}
 		return date;
 	}