From 06bfab7f23cf6f38ce8bfd826e90ff692f2a4beb Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Wed, 14 Oct 2009 12:10:40 +0000
Subject: [PATCH] Follow up for bug 292051.

---
 .../cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java
index bf4a0316b7b..b0e7aaebc4b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java
@@ -42,14 +42,14 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod
 
 	public IASTDeclaration getPrimaryDeclaration() throws DOMException{
 		//first check if we already know it
-		if( declarations != null ){
+		if (declarations != null) {
 			for (IASTName declaration : declarations) {
 				IASTNode parent = declaration.getParent();
 				while (!(parent instanceof IASTDeclaration) && parent != null)
 					parent = parent.getParent();
 
 				IASTDeclaration decl = (IASTDeclaration) parent;
-				if (decl instanceof ICPPASTCompositeTypeSpecifier)
+				if (decl != null && decl.getParent() instanceof ICPPASTCompositeTypeSpecifier)
 					return decl;
 			}
 		}