From efb5039f6111e7fd32d78ddc11b76a3b96cd6ab0 Mon Sep 17 00:00:00 2001 From: Uwe Stieber Date: Fri, 23 Feb 2007 14:56:27 +0000 Subject: [PATCH] [fix][175160] RSE Unit Tests fail in I20070222-1133 and I20070223-0730 --- .../internal/ui/view/SystemViewLabelAndContentProvider.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/SystemViewLabelAndContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java index deaca3061fb..a09d68dbc74 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewLabelAndContentProvider.java @@ -268,7 +268,9 @@ public class SystemViewLabelAndContentProvider extends LabelProvider } if (supportsDeferredQueries()) { - if (manager != null && adapter.supportsDeferredQueries()) + // The adapter needs to be checked to be not null, otherwise + // we run into an NPE here. + if (manager != null && adapter != null && adapter.supportsDeferredQueries()) { ISubSystem ss = null; if (object instanceof IContextObject)