--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2009/10/08 11:50:46	420
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2009/10/08 12:19:42	421
@@ -14,6 +14,9 @@
 import com.gargoylesoftware.htmlunit.html.HtmlElement;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
+import dk.thoerup.curcuitbreaker.CircuitBreaker;
+import dk.thoerup.curcuitbreaker.CircuitBreakerManager;
+
 public class TimetableFetcher {
 	
 	class NullRefreshHandler implements RefreshHandler {
@@ -28,7 +31,7 @@
 	Logger logger = Logger.getLogger(TimetableFetcher.class.getName());
 	
 	
-	List<TimetableBean> cachedLookupTimetable(String trainID, String type) throws Exception {
+	List<TimetableBean> cachedLookupTimetable(String trainID, String type) throws Throwable {
 		String key = trainID+type;
 		List<TimetableBean> list = cache.get(key);
 		
@@ -41,7 +44,7 @@
 		return list;
 	}
 
-	List<TimetableBean> lookupTimetable(String trainID, String type) throws Exception {		
+	List<TimetableBean> lookupTimetable(String trainID, String type) throws Throwable {		
 		List<TimetableBean> timetableList = new ArrayList<TimetableBean>();
 		
 		String url = "http://www.bane.dk/visRute.asp?W=" + type + "&TogNr=" + trainID + "&artikelId=4276";
@@ -54,8 +57,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;