diff servlet/src/digilib/servlet/Scaler.java @ 570:fd2ef7e46119

more cleanup, set version to 1.8.2
author robcast
date Tue, 21 Dec 2010 20:24:09 +0100
parents 686086d6e6d6
children 6e8488acb499 beeedf90cb81
line wrap: on
line diff
--- a/servlet/src/digilib/servlet/Scaler.java	Tue Dec 21 09:52:16 2010 +0100
+++ b/servlet/src/digilib/servlet/Scaler.java	Tue Dec 21 20:24:09 2010 +0100
@@ -19,6 +19,7 @@
 import digilib.auth.AuthOps;
 import digilib.image.DocuImage;
 import digilib.image.ImageJobDescription;
+import digilib.image.ImageOpException;
 import digilib.image.ImageWorker;
 import digilib.io.DocuDirCache;
 import digilib.io.DocuDirectory;
@@ -31,7 +32,7 @@
 public class Scaler extends HttpServlet {
 
     /** digilib servlet version (for all components) */
-    public static final String version = "1.9.0a";
+    public static final String version = "1.8.2a";
 
     /** servlet error codes */
     public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};
@@ -249,6 +250,9 @@
             logger.debug("Job Processing Time: "
                     + (System.currentTimeMillis() - startTime) + "ms");
 
+        } catch (ImageOpException e) {
+            logger.error(e.getClass() + ": " + e.getMessage());
+            digilibError(errMsgType, Error.IMAGE, null, response);
         } catch (IOException e) {
             logger.error(e.getClass() + ": " + e.getMessage());
             digilibError(errMsgType, Error.FILE, null, response);
@@ -306,7 +310,7 @@
                 // default: image
                 ServletOps.sendFile(img, null, null, response);
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             logger.error("Error sending error!", e);
         }