diff options
| author | Doug Schaefer | 2008-04-23 01:41:18 +0000 |
|---|---|---|
| committer | Doug Schaefer | 2008-04-23 01:41:18 +0000 |
| commit | 2eaa4d0ff6c4c90631a0c98f72af29758fb89e14 (patch) | |
| tree | 4715fbddcaa3d537e13021e563b424d327c6708e /build/org.eclipse.cdt.managedbuilder.core | |
| parent | 49283fae5116cf6e2a63b0000f1db6952f72a951 (diff) | |
| download | org.eclipse.cdt-2eaa4d0ff6c4c90631a0c98f72af29758fb89e14.tar.gz org.eclipse.cdt-2eaa4d0ff6c4c90631a0c98f72af29758fb89e14.tar.xz org.eclipse.cdt-2eaa4d0ff6c4c90631a0c98f72af29758fb89e14.zip | |
Fix an NPE when there are no toolchains defined.
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core')
| -rw-r--r-- | build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java index ad0ff7797fc..9b6e2f5e0d6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java @@ -320,20 +320,21 @@ public class ManagedBuildManager extends AbstractCExtension { // To Do // Create the array and copy the elements over - int size = projectTypes != null ? - projectTypes.size() + (definedTypes != null ? definedTypes.size() : 0) : - 0; + int size = projectTypes != null ? projectTypes.size() : 0; + size += definedTypes != null ? definedTypes.size() : 0; IProjectType[] types = new IProjectType[size]; - int n = 0; - for (int i = 0; i < projectTypes.size(); ++i) - types[n++] = (IProjectType)projectTypes.get(i); + if (size > 0) { + int n = 0; + for (int i = 0; i < projectTypes.size(); ++i) + types[n++] = (IProjectType)projectTypes.get(i); + + if (definedTypes != null) + for (int i = 0; i < definedTypes.size(); ++i) + types[n++] = definedTypes.get(i); + } - if (definedTypes != null) - for (int i = 0; i < definedTypes.size(); ++i) - types[n++] = definedTypes.get(i); - return types; } |