From 8e53832b18453d2dea5c2411982d42f1f211d320 Mon Sep 17 00:00:00 2001 From: Karsten Thoms Date: Wed, 14 Nov 2018 04:36:54 +0100 Subject: [PATCH] [#959] hasAnnotation: Add null guard Signed-off-by: Karsten Thoms --- .../src/org/eclipse/xtext/xtext/XtextValidator.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValidator.java b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValidator.java index a4f5d0e84..03e187dc8 100644 --- a/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValidator.java +++ b/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValidator.java @@ -1322,6 +1322,9 @@ public class XtextValidator extends AbstractDeclarativeValidator { * @since 2.14 */ protected boolean hasAnnotation(AbstractRule rule, String annotationName) { + if (rule == null) { + return false; + } return rule.getAnnotations().stream().anyMatch(e -> annotationName.equals(e.getName())); }