--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2009/10/08 11:50:46	420
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2009/10/08 12:19:42	421
@@ -10,6 +10,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import dk.thoerup.curcuitbreaker.CircuitBreakerException;
+
 /**
  * Servlet implementation class TimetableServlet
  */
@@ -43,7 +45,10 @@
 		} catch (java.net.SocketTimeoutException ste) {
 			logger.warning("(timetable) Read timed out, train="+train);
 			response.sendError(500, "Backend timed out");
-		} catch (Exception e) {
+		} catch (CircuitBreakerException cbe) {
+			logger.warning("Circuitbreaker - failing fast");
+			response.sendError(500);
+		}catch (Throwable e) {
 			logger.log(Level.WARNING, "failure looking up timetable: train=" +train, e);
 			response.sendError(500);
 		}