From 99bc710df40fda114893e521d2d80c1e646fd6fd Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Wed, 21 May 2008 14:29:24 +0000
Subject: [PATCH] Fixes a NPE, bug 230871.

---
 .../internal/core/dom/parser/cpp/CPPScopeMapper.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java
index e73099db925..b37f7447469 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java
@@ -176,11 +176,17 @@ public class CPPScopeMapper {
 			return "";    //$NON-NLS-1$
 		}
 		StringBuilder buf= new StringBuilder();
-		buf.append(scope.getScopeName().toCharArray());
+		IName scopeName = scope.getScopeName();
+		if (scopeName != null) {
+			buf.append(scopeName.toCharArray());
+		}
 		scope= scope.getParent();
 		while (scope != null && scope != tuscope) {
 			buf.append(':');  
-			buf.append(scope.getScopeName().toCharArray());
+			scopeName= scope.getScopeName();
+			if (scopeName != null) {
+				buf.append(scope.getScopeName().toCharArray());
+			}
 			scope= scope.getParent();
 		}
 		return buf.toString();