From 2b5f813e6b75160e9c7c2afa7e928d168cd9af65 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Tue, 6 Jul 2004 17:50:51 +0000
Subject: [PATCH] 2004-07-06 Chris Wiebe

	This patch prevents some NPEs from happening in the class browser.  I
	suggest this should be applied to both HEAD and CDT_2_0 branch.

	* browser/org/eclipse/cdt/core/browser/TypeInfo.java
---
 core/org.eclipse.cdt.core/browser/ChangeLog-browser        | 7 +++++++
 .../browser/org/eclipse/cdt/core/browser/TypeInfo.java     | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.core/browser/ChangeLog-browser b/core/org.eclipse.cdt.core/browser/ChangeLog-browser
index 27780187c4f..a6b22141ad4 100644
--- a/core/org.eclipse.cdt.core/browser/ChangeLog-browser
+++ b/core/org.eclipse.cdt.core/browser/ChangeLog-browser
@@ -1,3 +1,10 @@
+2004-07-06 Chris Wiebe
+
+	This patch prevents some NPEs from happening in the class browser.  I
+	suggest this should be applied to both HEAD and CDT_2_0 branch.
+
+	* browser/org/eclipse/cdt/core/browser/TypeInfo.java
+
 2004-06-22 Alain Magloire
 	Part of PR 68246.
 	Close the inputstream to release resource handle
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java
index d04cdaeeedb..ae233c3dcf7 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java
@@ -58,7 +58,10 @@ public class TypeInfo implements ITypeInfo
 		ITypeReference ref = getResolvedReference();
 		if (ref != null) {
 			ICElement[] elems = ref.getCElements();
-			if (elems.length > 1) {
+			if (elems != null && elems.length > 0) {
+				if (elems.length == 1)
+					return elems[0];
+
 				for (int i = 0; i < elems.length; ++i) {
 					ICElement elem = elems[i];
 					if (elem.getElementType() == fElementType && elem.getElementName().equals(getName())) {
@@ -66,8 +69,6 @@ public class TypeInfo implements ITypeInfo
 						return elem;
 					}
 				}
-			} else if (elems.length == 1) {
-				return elems[0];
 			}
 		}
 		return null;