--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimeoutMap.java	2009/10/10 08:33:27	431
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimeoutMap.java	2009/10/10 09:56:10	432
@@ -113,7 +113,12 @@
 	public V put(K key, V value) {		
 		CacheItem<V> item= new CacheItem<V>(value);
 		
-		return cache.put(key, item).value;
+		item = cache.put(key, item);
+		
+		if (item != null)
+			return item.value;
+		else
+			return null; 
 	}
 	
 }