From 51ad68a3b508297e6e413d6efa707ad8157bbb9b Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Mon, 3 Mar 2008 13:24:30 +0000 Subject: [PATCH] NPE fix --- .../managedbuilder/ui/properties/BuildStepsTab.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java index 8112e64c053..6aa0b88d0af 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java @@ -16,6 +16,7 @@ import java.util.Set; import java.util.TreeSet; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICFileDescription; import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder; import org.eclipse.cdt.core.settings.model.ICMultiResourceDescription; import org.eclipse.cdt.core.settings.model.ICResourceDescription; @@ -437,15 +438,18 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab { return; combo.removeAll(); boolean prj = page.isForProject(); - IConfiguration c = null; - ITool t = null; if (prj || tool != null) { for (ICConfigurationDescription cf : page.getCfgsEditable()) { + IConfiguration c = null; + ITool t = null; if (prj) { c = getCfg(cf); } else { - ICResourceDescription r = cf.getResourceDescription(cfgdescr.getPath(), false); - t = getRcbsTool((IFileInfo)getResCfg(r)); + ICResourceDescription r = cf.getResourceDescription(cfgdescr.getPath(), true); + if (r != null && r instanceof ICFileDescription) + t = getRcbsTool((IFileInfo)getResCfg(r)); + if (t == null) + continue; // there's no specific resconfig for this configuration } String s = null; switch (field) {