--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2009/09/25 13:54:16	347
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2009/09/27 19:14:39	348
@@ -5,6 +5,8 @@
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -29,6 +31,8 @@
  */
 public class DepartureServlet extends HttpServlet {
 	private static final long serialVersionUID = 1L;
+	
+	Logger logger = Logger.getLogger( DepartureServlet.class.getName() );
 
 	DepartureFetcher fetcher = new DepartureFetcher();
     TransformerFactory transformerFactory = TransformerFactory.newInstance();
@@ -45,8 +49,14 @@
 
 		try {
 			beans = fetcher.lookupDepartures(station);
+		} catch (java.net.SocketTimeoutException ste) {
+			logger.warning("Read timed out, station="+station);
+			resp.sendError(500);
+			return;
 		} catch (Exception e) {
-			throw new ServletException(e);
+			logger.log(Level.WARNING, "Unknown exception, station=" +station, e);
+			resp.sendError(500);
+			return;
 		}
 		
 		resp.setDateHeader("Expires", 0);