Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarvin Mueller2014-12-10 11:52:22 +0000
committerMarvin Mueller2014-12-10 12:19:38 +0000
commitd49b329aa4fe07bc37b32d69a43b8844e56dd0d7 (patch)
tree5828772ae46914dcf0717e23464c337ff4160e9a /org.eclipse.jubula.rc.swt
parentabecda2fe6e77206ff04ea407f797000b197e2bf (diff)
downloadorg.eclipse.jubula.core-d49b329aa4fe07bc37b32d69a43b8844e56dd0d7.tar.gz
org.eclipse.jubula.core-d49b329aa4fe07bc37b32d69a43b8844e56dd0d7.tar.xz
org.eclipse.jubula.core-d49b329aa4fe07bc37b32d69a43b8844e56dd0d7.zip
Sprint task - fix for http://bugszilla.bredex.de/1591
Diffstat (limited to 'org.eclipse.jubula.rc.swt')
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/EventThreadQueuerSwtImpl.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/EventThreadQueuerSwtImpl.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/EventThreadQueuerSwtImpl.java
index 7203f5168..0d98ae198 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/EventThreadQueuerSwtImpl.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/EventThreadQueuerSwtImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.jubula.rc.common.driver.RunnableWrapper;
import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.rc.common.logger.AutServerLogger;
import org.eclipse.jubula.rc.swt.SwtAUTServer;
+import org.eclipse.swt.SWTException;
import org.eclipse.swt.widgets.Display;
@@ -49,7 +50,17 @@ public class EventThreadQueuerSwtImpl implements IEventThreadQueuer {
log.warn("Display has already been disposed - skipping IRunnable invocation!"); //$NON-NLS-1$
return null;
}
- display.syncExec(wrapper);
+ try {
+ display.syncExec(wrapper);
+ } catch (SWTException e) {
+ if (display.isDisposed()) {
+ // this may happen e.g. during the shutdown process of the AUT
+ // see http://bugzilla.bredex.de/1591
+ log.warn("Display has disposed while waiting for IRunnable execution!"); //$NON-NLS-1$
+ return null;
+ }
+ log.warn("SWTException while waiting for IRunnable execution!", e); //$NON-NLS-1$
+ }
StepExecutionException exception = wrapper.getException();
if (exception != null) {
throw new InvocationTargetException(exception);

Back to the top