QPID-1995: prevent possible SWTException during application shutdown if worker thread tries to access the display after it has beeen disposed

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@796644 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 5 deletions

diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
index 0b32da5a29..691ceedcf4 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/VHNotificationsTabControl.java
@@ -386,14 +386,15 @@ public class VHNotificationsTabControl extends TabControl
         public void run()
         {
             final Display display = _tabFolder.getDisplay();
-            if (display == null)
-            {
-                setWorkerRunning(false);
-                return; //stop the thread
-            }
             
             while(keepGoing)
             {
+                if (display == null || display.isDisposed())
+                {
+                    setWorkerRunning(false);
+                    break; //stop the thread
+                }
+                
                 display.syncExec(new Runnable()
                 {
                     public void run()