Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Sennikovsky2006-06-15 14:55:53 +0000
committerMikhail Sennikovsky2006-06-15 14:55:53 +0000
commitb3fa88e4c8c5cfb319cfd8dddc78a4b3e07e60e7 (patch)
tree9372cef149ebba99f9394fd3f3815d85495d5e29
parent4836857ef3de2510e9d82982f4fef118ade4cbe5 (diff)
downloadorg.eclipse.cdt-b3fa88e4c8c5cfb319cfd8dddc78a4b3e07e60e7.tar.gz
org.eclipse.cdt-b3fa88e4c8c5cfb319cfd8dddc78a4b3e07e60e7.tar.xz
org.eclipse.cdt-b3fa88e4c8c5cfb319cfd8dddc78a4b3e07e60e7.zip
Fix for bug#147070
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java3
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java
index 60322f4b53..3fbeef5ae7 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PropertyManager.java
@@ -341,6 +341,9 @@ public class PropertyManager {
}
public void clearProperties(IManagedProject mProject){
+ if(mProject == null)
+ return;
+
IConfiguration cfgs[] = mProject.getConfigurations();
for(int i = 0; i < cfgs.length; i++)
clearLoaddedData(cfgs[i]);
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index 569628917b..c12aa12eb7 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -3865,6 +3865,9 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
path = path.removeFirstSegments(dirLocation.segmentCount()).setDevice(null);
}
}
+ if ( fileList == null ) {
+ fileList = new Vector();
+ }
fileList.add(path.toString());
}
}

Back to the top