Improved unmounting (failing, if encrypted drive is still busy)

This commit is contained in:
Sebastian Stenzel
2015-03-14 21:58:52 +01:00
parent 652c4cbafb
commit f22142a876
7 changed files with 30 additions and 16 deletions
@@ -55,15 +55,16 @@ public class WebDavServlet extends AbstractWebdavServlet {
public void destroy() {
backgroundTaskExecutor.shutdown();
try {
final boolean tasksFinished = backgroundTaskExecutor.awaitTermination(10, TimeUnit.SECONDS);
final boolean tasksFinished = backgroundTaskExecutor.awaitTermination(2, TimeUnit.SECONDS);
if (!tasksFinished) {
backgroundTaskExecutor.shutdownNow();
}
} catch (InterruptedException e) {
backgroundTaskExecutor.shutdownNow();
Thread.currentThread().interrupt();
} finally {
super.destroy();
}
super.destroy();
}
@Override