From 1b041f56b47152134ec1ce506f44fbdda53ac9bb Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Thu, 17 Jul 2008 17:27:45 +0000 Subject: [PATCH] Fix for [Bug 222585] NPE at GnuMakefileGenerator$3.visit() from Zhang Yi with small modification --- .../cdt/managedbuilder/internal/core/Configuration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 f54b3bd587b..73b520ef3a5 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 @@ -2289,8 +2289,8 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild } public ICSourceEntry[] getSourceEntries() { - if(sourceEntries == null){ - if(parent != null) + if(sourceEntries == null || sourceEntries.length == 0){ + if(parent != null && sourceEntries == null) return parent.getSourceEntries(); return new ICSourceEntry[]{new CSourceEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED)}; //$NON-NLS-1$