This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit 1036da46b86565024425dd293522f96c0dcfc4cf Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 24 14:37:05 2014 +0200 better call of actionContext.setActionInProgress(this, false); --- .../org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java index 4b0efa4..4309be7 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationUIAction.java @@ -117,8 +117,8 @@ public class ApplicationUIAction<A extends AbstractApplicationAction> extends Ab try { doAction = action.prepareAction(); } catch (Exception e) { - actionContext.setActionInProgress(this, false); action.releaseAction(); + actionContext.setActionInProgress(this, false); throw ApplicationActionException.propagateError(action, e); } @@ -232,11 +232,11 @@ public class ApplicationUIAction<A extends AbstractApplicationAction> extends Ab protected void unlock() { TIME_LOG.log(t0, "Task [" + getLogicAction().getClass().getSimpleName() + "] End"); - getLogicAction().getContext().setActionInProgress(this, false); if (wait) { synchronized (lock) { lock.notifyAll(); } } + getLogicAction().getContext().setActionInProgress(this, false); } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.