From b3fa88e4c8c5cfb319cfd8dddc78a4b3e07e60e7 Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Thu, 15 Jun 2006 14:55:53 +0000
Subject: [PATCH] Fix for bug#147070

---
 .../cdt/managedbuilder/internal/core/PropertyManager.java      | 3 +++
 .../cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java   | 3 +++
 2 files changed, 6 insertions(+)

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 60322f4b53e..3fbeef5ae73 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 569628917b6..c12aa12eb72 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());
 			}
 		}