From c038f8b53edbeeedb566cc7403dcfe64719de582 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Mon, 26 Apr 2010 13:20:17 +0000
Subject: [PATCH] Bug 309096: NPE in composite index.

---
 .../core/index/composite/cpp/CPPCompositesFactory.java         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
index abeb51c1236..b44349ff649 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
@@ -204,6 +204,9 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
 	}
 	
 	public IValue getCompositeValue(IValue v) {
+		if (v == null)
+			return null;
+		
 		IBinding[] b= v.getUnknownBindings();
 		if (b.length == 0)
 			return v;