Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMikhail Sennikovsky2008-07-17 17:27:45 +0000
committerMikhail Sennikovsky2008-07-17 17:27:45 +0000
commit1b041f56b47152134ec1ce506f44fbdda53ac9bb (patch)
tree725baa5d0b01480384835818402fabccd82a354d /build
parent2d53d1dd3169ca4af683cef66fcc512dc4f340b8 (diff)
downloadorg.eclipse.cdt-1b041f56b47152134ec1ce506f44fbdda53ac9bb.tar.gz
org.eclipse.cdt-1b041f56b47152134ec1ce506f44fbdda53ac9bb.tar.xz
org.eclipse.cdt-1b041f56b47152134ec1ce506f44fbdda53ac9bb.zip
Fix for [Bug 222585] NPE at GnuMakefileGenerator$3.visit() from Zhang Yi with small modification
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java4
1 files 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$

Back to the top