--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimeoutMap.java	2009/10/10 09:56:10	432
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimeoutMap.java	2010/07/07 12:02:40	966
@@ -36,15 +36,14 @@
 	}
 
 	@Override
-	public boolean containsKey(Object arg0) {
-		CacheItem<V> item = cache.get(arg0);
-		
-		return (item != null);
+	public boolean containsKey(Object key) {
+		return cache.containsKey(key);
 	}
 
 	@Override
 	public boolean containsValue(Object arg0) {
-		return values().contains(arg0);		
+		//return values().contains(arg0);
+		throw new UnsupportedOperationException();
 	}
 
 	@Override