--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2009/10/02 15:06:08	387
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2009/10/22 06:04:45	468
@@ -5,6 +5,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 
 import com.gargoylesoftware.htmlunit.Page;
@@ -14,6 +15,9 @@
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
+import dk.thoerup.circuitbreaker.CircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreakerManager;
+
 public class TimetableFetcher {
 	
 	class NullRefreshHandler implements RefreshHandler {
@@ -22,7 +26,7 @@
 		
 	}
 		
-	TimeoutCache<String, List<TimetableBean>> cache = new TimeoutCache<String,List<TimetableBean>>(120 * 1000);
+	Map<String, List<TimetableBean>> cache = new TimeoutMap<String,List<TimetableBean>>(120 * 1000);
 	
 	
 	Logger logger = Logger.getLogger(TimetableFetcher.class.getName());
@@ -33,11 +37,10 @@
 		List<TimetableBean> list = cache.get(key);
 		
 		if (list == null) {
-			logger.warning("Timetable: Cache miss " + trainID); //remove before production
 			list = lookupTimetable(trainID,type);
 			cache.put(key, list);
 		} else {
-			logger.warning("Timetable: Cache hit " + trainID); //remove before production
+			logger.info("Timetable: Cache hit " + trainID); 
 		}
 		return list;
 	}
@@ -55,8 +58,11 @@
 	    webClient.setCssEnabled(false);
 	    
 	    
-	    final HtmlPage page = webClient.getPage(url);
+	    BanedkInvocation wrapper = new BanedkInvocation(webClient, url);
+	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
+	    HtmlPage page = (HtmlPage) breaker.invoke(wrapper);
+	    	    
 	    
 	    boolean currentStation = false;
 	    boolean currentStationSaved = false;