# HG changeset patch
# User robcast
# Date 1298115140 -3600
# Node ID 034ab33984d2db6e7ac359364798e9abe9417d67
# Parent  72662bb585ba02034dff9b326fa11dfc4a2faa32
check for ServletResponse.isCommited()

diff -r 72662bb585ba -r 034ab33984d2 servlet/src/digilib/servlet/Scaler.java
--- a/servlet/src/digilib/servlet/Scaler.java	Sat Feb 19 11:07:08 2011 +0100
+++ b/servlet/src/digilib/servlet/Scaler.java	Sat Feb 19 12:32:20 2011 +0100
@@ -30,7 +30,7 @@
 public class Scaler extends HttpServlet {
 
     /** digilib servlet version (for all components) */
-    public static final String version = "1.9.0a2";
+    public static final String version = "1.9.0a3";
 
     /** servlet error codes */
     public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};
diff -r 72662bb585ba -r 034ab33984d2 servlet/src/digilib/servlet/ServletOps.java
--- a/servlet/src/digilib/servlet/ServletOps.java	Sat Feb 19 11:07:08 2011 +0100
+++ b/servlet/src/digilib/servlet/ServletOps.java	Sat Feb 19 12:32:20 2011 +0100
@@ -222,6 +222,10 @@
     public static void sendFile(File f, String mt, String name, HttpServletResponse response, Logger logger)
             throws ImageOpException, ServletException {
         logger.debug("sendRawFile(" + mt + ", " + f + ")");
+    	if (response.isCommitted()) {
+        	logger.warn("sendFile: response already committed!");
+        	//return;
+    	}
         if (mt == null) {
             // auto-detect mime-type
             mt = FileOps.mimeForFile(f);
@@ -293,6 +297,10 @@
     public static void sendImage(DocuImage img, String mimeType,
             HttpServletResponse response, Logger logger) throws ImageOpException,
             ServletException {
+    	if (response.isCommitted()) {
+        	logger.warn("sendImage: response already committed!");
+        	//return;
+    	}
         try {
             OutputStream outstream = response.getOutputStream();
             // setup output -- if mime type is set use that otherwise