This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 7b65b9149aa5283528903416de39af4769ba804d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 13 16:30:45 2016 +0100 Essayer de fermer le context applicatif en cas de terminaison brutale de l'application --- .../main/java/fr/ird/observe/ObserveRunner.java | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java index 5943996..236a13e 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java +++ b/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java @@ -384,13 +384,28 @@ public abstract class ObserveRunner extends ApplicationRunner { log.info("ObServe shutdown at " + new Date()); } - // on ferme le service de traduction uniquement si on quitte - // definitivement l'application - I18n.close(); + try { + + ObserveContext observeContext = ObserveContext.get(); + + if (observeContext.getDataSource()!=null) { + + // on est arrivé ici sans fermer proprement l'application + onClose(false); + } - getActionExecutor().terminatesAndWaits(); + } finally { + + // on ferme le service de traduction uniquement si on quitte + // definitivement l'application + I18n.close(); + + getActionExecutor().terminatesAndWaits(); + + Runtime.getRuntime().halt(0); + + } - Runtime.getRuntime().halt(0); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.