# HG changeset patch
# User robcast
# Date 1324464733 -3600
# Node ID f1e576b80145e20b4c363e112072e8bf5ae6edde
# Parent  5f03f6937c328b5f86d2654fb499a789b50cf620# Parent  58343be11fa388e0909b621ac474693af32250dd
Merge with 58343be11fa388e0909b621ac474693af32250dd

diff -r 58343be11fa3 -r f1e576b80145 servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java
--- a/servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java	Wed Dec 21 11:49:41 2011 +0100
+++ b/servlet3/src/main/java/digilib/servlet/AsyncServletWorker.java	Wed Dec 21 11:52:13 2011 +0100
@@ -62,6 +62,7 @@
     /**
      * runs the ImageWorker and writes the image to the ServletResponse.
      */
+    @Override
     public void run() {
         // get fresh response
         HttpServletResponse response = (HttpServletResponse) asyncContext
@@ -149,7 +150,7 @@
         }
         imageWorker.stopNow();
         this.completed = true;
-        Scaler.digilibError(errMsgType, Error.UNKNOWN, null,
+        Scaler.digilibError(errMsgType, Error.UNKNOWN, "ERROR: timeout rendering image!",
                 (HttpServletResponse) asyncContext.getResponse());
         asyncContext.complete();
     }