From 5d6b9dc1c5664f0fd5673c77de31f8bc0d097a58 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Tue, 21 Jul 2009 09:23:55 +0000 Subject: QPID-1994: prevent NPE caused by refreshing whilst app is closing down git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@796209 13f79535-47bb-0310-9956-ffa450edef68 --- .../management/ui/RefreshIntervalComboPanel.java | 29 ++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'java/management') diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java index cada746b29..ae60467bf5 100644 --- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/RefreshIntervalComboPanel.java +++ b/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); + } } } -- cgit v1.2.1