From cf86879a9642c9978862b2096d442544956ca97e Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 13 Jun 2008 13:26:20 +0000 Subject: [PATCH] [236874] NPE upon selecting an item that is not associated with subsystem --- .../UI/org/eclipse/rse/internal/ui/view/SystemView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index 948cd2a935a..b25c4a334d2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -58,6 +58,7 @@ * David McKnight (IBM) - [233570] ClassCastException when moving filter after "go into" action * David Dykstal (IBM) - [233530] Backing out previous change for this bug * David McKnight (IBM) - [223461] [Refresh][api] Refresh expanded folder under filter refreshes Filter + * David McKnight (IBM) - [236874] NPE upon selecting an item that is not associated with subsystem ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -4826,7 +4827,8 @@ public class SystemView extends SafeTreeViewer if (selectionIsRemoteObject && !selectionFlagsUpdated) { ISubSystem srcSubSystem = adapter.getSubSystem(element); - if (srcSubSystem.isConnected() || element instanceof ISystemFilterReference || element instanceof ISubSystem) + if (srcSubSystem != null && + (srcSubSystem.isConnected() || element instanceof ISystemFilterReference || element instanceof ISubSystem)) { SystemRemoteElementResourceSet set = null; if (lastSet != null)