QPID-1994: prevent NPE caused by refreshing whilst app is closing down

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

1 files changed, 16 insertions, 13 deletions

diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java
index cada746b29..ae60467bf5 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java
@@ -106,21 +106,24 @@ public class RefreshIntervalComboPanel extends WorkbenchWindowControlContributio
         @Override
         public void run()
         {
-            IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); 
-            final MBeanView mbView = (MBeanView)window.getActivePage().findView(MBeanView.ID);
-
-            final NavigationView navView = (NavigationView)window.getActivePage().findView(NavigationView.ID);
-            try
-            {
-                mbView.refresh();
-                navView.refresh();
-            }
-            catch (Exception ex)
+            IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+            if(window != null)
             {
-                MBeanUtility.handleException(ex);
-            }
+                final MBeanView mbView = (MBeanView)window.getActivePage().findView(MBeanView.ID);
 
-            _display.timerExec(1000 * seconds, this);
+                final NavigationView navView = (NavigationView)window.getActivePage().findView(NavigationView.ID);
+                try
+                {
+                    mbView.refresh();
+                    navView.refresh();
+                }
+                catch (Exception ex)
+                {
+                    MBeanUtility.handleException(ex);
+                }
+
+                _display.timerExec(1000 * seconds, this);
+            }
         }
         
     }