[Schmitzm-commits] r1575 - trunk/schmitzm-core/src/main/java/de/schmitzm/lang

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2011-05-11 13:18:29 +0200 (Wed, 11 May 2011)
New Revision: 1575

Modified:
   trunk/schmitzm-core/src/main/java/de/schmitzm/lang/TimedHashMap.java
Log:


Modified: trunk/schmitzm-core/src/main/java/de/schmitzm/lang/TimedHashMap.java
===================================================================
--- trunk/schmitzm-core/src/main/java/de/schmitzm/lang/TimedHashMap.java	2011-05-06 16:08:52 UTC (rev 1574)
+++ trunk/schmitzm-core/src/main/java/de/schmitzm/lang/TimedHashMap.java	2011-05-11 11:18:29 UTC (rev 1575)
@@ -70,7 +70,7 @@
 		V v = super.get(key);
 		if (v != null) {
 			Long inputTime = inputTimes.get(key);
-			if ((System.currentTimeMillis() - inputTime) >= timeout) {
+			if (inputTime != null && (System.currentTimeMillis() - inputTime) >= timeout) {
 				remove(key);
 				inputTimes.remove(key);
 				return null;