From a0110b9296db1462cf579b9441d94e726e040535 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 19 Aug 2013 13:54:33 -0700 Subject: [PATCH] Bug 415388 - NPE in ASTBuiltinName.getAdapter --- .../cdt/internal/core/parser/scanner/ASTPreprocessorName.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorName.java index 0fd1fdfa400..2255fe4d174 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorName.java @@ -198,7 +198,7 @@ class ASTBuiltinName extends ASTPreprocessorDefinition implements IAdaptable { if (adapter.isAssignableFrom(ASTBuiltinName.class)) { return this; } - if (adapter.isAssignableFrom(fOriginalDefinition.getClass())) { + if (fOriginalDefinition != null && adapter.isAssignableFrom(fOriginalDefinition.getClass())) { return fOriginalDefinition; } return null;