From afe5b1dea97669a4eb69e7d150ddd605f02442bc Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 16 Jun 2011 13:51:20 +0000 Subject: [PATCH] [349491] possible NPE on shutdown due to event firing --- .../shells/core/subsystems/RemoteCmdSubSystem.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java index a900ad08256..48416db362f 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java @@ -24,6 +24,7 @@ * David McKnight (IBM) - [272882] [api] Handle exceptions in IService.initService() * David McKnight (IBM) [302724] problems with environment variable substitution * David McKnight (IBM) - [338031] Remote Shell view tabs should have close (x) icon + * David McKnight (IBM) - [349491] possible NPE on shutdown due to event firing *******************************************************************************/ package org.eclipse.rse.subsystems.shells.core.subsystems; @@ -709,8 +710,10 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd public void run() { - ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); - registry.fireEvent(new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_REFRESH, _ss)); + if (RSECorePlugin.isTheSystemRegistryActive()){ + ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry(); + registry.fireEvent(new SystemResourceChangeEvent(_ss, ISystemResourceChangeEvents.EVENT_REFRESH, _ss)); + } } }