--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/08/30 11:53:34	1020
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureFetcher.java	2010/09/02 18:37:49	1026
@@ -31,8 +31,10 @@
 	StationDAO stationDao = new StationDAO();
 	
 	private boolean useTempSite;
+	private int replyTimeout;
 	
-	public DepartureFetcher(boolean tempSite, int cacheTimeout) {
+	public DepartureFetcher(boolean tempSite, int cacheTimeout, int replyTimeout) {
+		this.replyTimeout = replyTimeout;
 		useTempSite = tempSite;
 		cache = new TimeoutMap<String,DepartureBean>(cacheTimeout);
 	}
@@ -63,6 +65,8 @@
 		
 		StationBean station = stationDao.getById(stationID);
 		
+		departureBean.stationName = station.getName();
+		
 		if (station.getRegional() != null) {
 			DepartureBean tempBean = lookupDepartures(station.getRegional(), TrainType.REGIONAL, arrival);
 			departureBean.departureEntries.addAll( tempBean.departureEntries );
@@ -117,7 +121,7 @@
 	    
 	    
 	    //logger.info("URI: " + uri);	    
-	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), 2500);
+	    JsoupInvocation wrapper = new JsoupInvocation( new URL(uri), replyTimeout);
 	    CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("banedk");
 	    
 	    Document page = (Document) breaker.invoke(wrapper);