Fix for problem with tool-chain defined at top level in manifest

2 files changed, 8 insertions, 6 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
index 6a3bf791693..8f1897838a9 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
@@ -309,9 +309,9 @@ public class Configuration extends BuildObject implements IConfiguration {
 			// the selected configuration element, create a tool element child of 
 			// the cloned configuration's tool-chain element that specifies the 
 			// original tool element as its superClass.
-			Iterator iter = superChain.getToolList().listIterator();
-			while (iter.hasNext()) {
-			    Tool toolChild = (Tool) iter.next();
+			ITool[] tools = superChain.getTools();
+			for (int i=0; i<tools.length; i++) {
+			    Tool toolChild = (Tool)tools[i];
 				nnn = ManagedBuildManager.getRandomNumber();
 				tmpId = toolChild.getId();
 				version = ManagedBuildManager.getVersionFromIdAndVersion(tmpId);
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/InputType.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/InputType.java
index 55715b71d3b..4f983a82687 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/InputType.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/InputType.java
@@ -25,6 +25,7 @@ import org.eclipse.cdt.managedbuilder.core.IProjectType;
 import org.eclipse.cdt.managedbuilder.core.ITool;
 import org.eclipse.cdt.managedbuilder.core.IToolChain;
 import org.eclipse.cdt.managedbuilder.core.IResourceConfiguration;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IInputType;
 import org.eclipse.cdt.managedbuilder.core.IInputOrder;
 import org.eclipse.cdt.managedbuilder.core.IAdditionalInput;
@@ -687,16 +688,17 @@ public class InputType extends BuildObject implements IInputType {
 	 * Returns the project that uses this IInputType 
 	 */
 	public IProject getProject(ITool tool) {
-		IProject project = null;
 		IBuildObject toolParent = tool.getParent();
 		if (toolParent != null) {
 			if (toolParent instanceof IToolChain) {
-				return (IProject)((IToolChain)toolParent).getParent().getOwner();
+				IConfiguration config = ((IToolChain)toolParent).getParent();
+				if (config == null) return null;
+				return (IProject)config.getOwner();
 			} else if (toolParent instanceof IResourceConfiguration) {
 				return (IProject)((IResourceConfiguration)toolParent).getOwner();
 			}
 		}
-		return project;
+		return null;
 	}
 	
 	/* (non-Javadoc)