From 4d7f508f83eacdd5c4b88a612354f1031f88ddb8 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Thu, 30 Aug 2007 09:41:35 +0000
Subject: [PATCH] JUnit-Tests: Fixes an occasional NPE

---
 .../org/eclipse/cdt/core/testplugin/CProjectHelper.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java
index ac069cce3f2..8cad8a8265f 100644
--- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java
+++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CProjectHelper.java
@@ -118,13 +118,18 @@ public class CProjectHelper {
 	 * @param project
 	 * @throws CoreException 
 	 */
-	public static void addDefaultBinaryParser(IProject project) throws CoreException {
+	public static boolean addDefaultBinaryParser(IProject project) throws CoreException {
 		ICExtensionReference[] binaryParsers= CCorePlugin.getDefault().getBinaryParserExtensions(project);
 		if (binaryParsers == null || binaryParsers.length == 0) {
 			ICProjectDescription desc= CCorePlugin.getDefault().getProjectDescription(project);
+			if (desc == null) {
+				return false;
+			}
+			
 			desc.getDefaultSettingConfiguration().create(CCorePlugin.BINARY_PARSER_UNIQ_ID, CCorePlugin.DEFAULT_BINARY_PARSER_UNIQ_ID);
 			CCorePlugin.getDefault().setProjectDescription(project, desc);
 		}
+		return true;
 	}
 
 	/**