From c3d24bd1b41b26f213f43cd0ef02c8e35547ba67 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Thu, 12 Nov 2009 18:09:50 +0000
Subject: [PATCH] Fixes a NPE, bug 294797.

---
 .../cdt/internal/ui/refactoring/rename/ASTManager.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java
index ebef6151351..25a1a3963bd 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java
@@ -94,6 +94,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespaceScope;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPReferenceType;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTypeParameter;
 import org.eclipse.cdt.core.index.IIndex;
+import org.eclipse.cdt.core.index.IIndexName;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ITranslationUnit;
@@ -394,7 +395,10 @@ public class ASTManager {
         try {
         	if (s1 instanceof IIndexScope) {
         		IIndexScope indexScope= (IIndexScope) s1;
-        		name= indexScope.getScopeName().toString();
+        		final IIndexName scopeName = indexScope.getScopeName();
+        		if (scopeName != null) {
+        			name= scopeName.toString();
+        		}
         	} else {
         		name= getNameOrNull(ASTInternal.getPhysicalNodeOfScope(s1));
         	}