This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit 709848abfb28aeb303faf06e22a1a2ba382a7a0e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 1 13:54:56 2015 +0200 Synchronise and swallow exceptions when opening ActionUI (See #3774) --- .../swing/action/ApplicationActionSwingWorker.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionSwingWorker.java b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionSwingWorker.java index e295c25..28a7573 100644 --- a/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionSwingWorker.java +++ b/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionSwingWorker.java @@ -146,6 +146,7 @@ public class ApplicationActionSwingWorker<A extends AbstractApplicationAction> e public TuttiActionTimerTask() { action.addPropertyChangeListener(AbstractApplicationAction.PROPERTY_DONE, new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { @@ -153,6 +154,7 @@ public class ApplicationActionSwingWorker<A extends AbstractApplicationAction> e cancel(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { //if (actionUI.isVisible()) { @@ -178,9 +180,26 @@ public class ApplicationActionSwingWorker<A extends AbstractApplicationAction> e } SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { - actionUI.open(action); + + synchronized (actionUI) { + + try { + actionUI.open(action); + } catch (Exception e) { + + // swallow any exception due to ui bad initialisation + // this should not happen, but it does :( + // See https://forge.codelutin.com/issues/7489 + // See http://stackoverflow.com/questions/15545055/nimbus-java-lang-classcastexcept... + // See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6785663 + if (log.isErrorEnabled()) { + log.error("Something was wrong while opening the action ui, but we do not care", e); + } + } + } } }); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.