Mercurial > hg > digilib-old
changeset 933:f1e576b80145
Merge with 58343be11fa388e0909b621ac474693af32250dd
author | robcast |
---|---|
date | Wed, 21 Dec 2011 11:52:13 +0100 |
parents | 5f03f6937c32 (diff) 58343be11fa3 (current diff) |
children | 065dd6895ce7 |
files | |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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(); }