--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/06/11 17:12:29	836
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/06/28 12:35:35	939
@@ -51,7 +51,7 @@
 	
 	List<TimetableBean> cachedLookupTimetable(String trainID, String type) throws Exception {
 		String key = trainID+type;
-		List<TimetableBean> list = null;//cache.get(key);
+		List<TimetableBean> list = cache.get(key);
 		
 		if (list == null) {
 			list = lookupTimetable(trainID,type);
@@ -76,7 +76,7 @@
 		
 		if (id == null) {
 			try {
-				id = stationDao.getBySpecificName(name);
+				id = stationDao.getIdByName(name);
 				stationCache.put(name, id);
 			} catch (SQLException e) {
 				logger.log(Level.SEVERE, "getStationId failed", e);
@@ -100,7 +100,7 @@
 	    webClient.setCssEnabled(false);
 	    
 	    
-	    BanedkInvocation wrapper = new BanedkInvocation(webClient, url);
+	    HtmlunitInvocation wrapper = new HtmlunitInvocation(webClient, url);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);