From d32b85432246f16551d5f011e9ae2da845c0f9c5 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Wed, 13 Jun 2007 09:07:44 +0000
Subject: [PATCH] Fix for 192358, NPE in search.

---
 .../ui/search/PDOMSearchTreeContentProvider.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTreeContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTreeContentProvider.java
index 6275f169c5a..6503e0241b1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTreeContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTreeContentProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 QNX Software Systems and others.
+ * Copyright (c) 2006, 2007 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -96,13 +96,18 @@ public class PDOMSearchTreeContentProvider implements ITreeContentProvider, IPDO
 	private void insertSearchElement(PDOMSearchElement element) {
 		IPath path = new Path(element.getFileName());
 		IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
+		boolean handled= false;
 		if (files.length > 0) {
 			for (int j = 0; j < files.length; ++j) {
 				ICElement celement = CoreModel.getDefault().create(files[j]);
-				insertChild(celement, element);
-				insertCElement(celement);
+				if (celement != null) {
+					insertChild(celement, element);
+					insertCElement(celement);
+					handled= true;
+				}
 			}
-		} else {
+		} 
+		if (!handled) {
 			String pathName = path.toOSString(); 
 			insertChild(pathName, element);
 			insertChild(result, pathName);