--- android/PicturePosterService/src/dk/thoerup/pictureposterservice/PictureServlet.java	2010/02/21 21:10:17	606
+++ android/PicturePosterService/src/dk/thoerup/pictureposterservice/PictureServlet.java	2010/02/22 13:06:46	607
@@ -1,5 +1,6 @@
 package dk.thoerup.pictureposterservice;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -20,13 +21,16 @@
 	Logger logger = Logger.getLogger(PictureServlet.class.getName());
 
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		String file = "";
-		try {
-			String pic = request.getParameter("pic");
-			response.setContentType("image/jpeg");
-			file = "/home/app/data/PicturePoster/" + pic + ".jpeg";
-			
-			FileInputStream in = new FileInputStream( file );
+		String fileName = "";
+
+		String pic = request.getParameter("pic");
+		response.setContentType("image/jpeg");
+		fileName = "/home/app/data/PicturePoster/" + pic + ".jpeg";
+		
+		File file = new File(fileName);
+		if (file.exists()) {
+			response.setContentLength( (int)file.length() );
+			FileInputStream in = new FileInputStream( fileName );
 			OutputStream out = response.getOutputStream();
 	
 			
@@ -37,8 +41,8 @@
 			}
 			in.close();
 			out.close();
-		} catch (FileNotFoundException ex) {
-			logger.info("PictureServlet, file not found: " + file);
+		} else {
+			logger.info("PictureServlet, file not found: " + fileName);
 			response.sendError(404);
 		}