# HG changeset patch # User robcast # Date 1292543160 -3600 # Node ID ad1d473a01f5539c9727ddb1fbbd5a0ce4012e7c # Parent 2e971b9f30227b6f627cb14e3665699a97d04890 clean up thread pools diff -r 2e971b9f3022 -r ad1d473a01f5 servlet/src/digilib/servlet/Initialiser.java --- a/servlet/src/digilib/servlet/Initialiser.java Fri Dec 17 00:32:18 2010 +0100 +++ b/servlet/src/digilib/servlet/Initialiser.java Fri Dec 17 00:46:00 2010 +0100 @@ -183,6 +183,22 @@ logger.error("Still running threads when shutting down image job queue: "+nrj); } } + if (pdfEx != null) { + // shut down pdf thread pool + List rj = pdfEx.shutdownNow(); + int nrj = rj.size(); + if (nrj > 0) { + logger.error("Still running threads when shutting down PDF job queue: "+nrj); + } + } + if (pdfImageEx != null) { + // shut down pdf image thread pool + List rj = pdfImageEx.shutdownNow(); + int nrj = rj.size(); + if (nrj > 0) { + logger.error("Still running threads when shutting down PDF-image job queue: "+nrj); + } + } super.destroy(); }