--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2010/09/16 13:32:10	1060
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2010/11/12 18:33:38	1190
@@ -1,7 +1,7 @@
 package dk.thoerup.traininfoservice.banedk;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.StringWriter;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -15,6 +15,7 @@
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
 
+import dk.thoerup.android.traininfo.common.TimetableBean;
 import dk.thoerup.circuitbreaker.CircuitBreakerException;
 import dk.thoerup.traininfoservice.Statistics;
 
@@ -70,7 +71,7 @@
 			Statistics.getInstance().incrementTimetableErrors();
 			response.sendError(500, "Backend timed out");
 		} catch (CircuitBreakerException cbe) {
-			logger.warning("Circuitbreaker - failing fast");
+			logger.warning("Circuitbreaker - failing fast, type=" + type + ", train="+train);
 			Statistics.getInstance().incrementTimetableErrors();
 			response.sendError(500);
 		}catch (Exception e) {
@@ -84,7 +85,7 @@
 	String formatTimetable(TimetableBean timetable) throws ServletException {
 		Serializer serializer = new Persister();
 
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		StringWriter out = new StringWriter();
 
 		try {
 			serializer.write(timetable, out);