Fix for issue #224 and #232: NPE in stub Groovy annotation

groovy · Dec 5, 2016 · df0c92d · df0c92d
1 parent 8abd6b1
commit df0c92d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...h/e42/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/...h/e42/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -295,7 +295,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().typeMismatchError(typeBinding, scope.getJavaLangAnnotationAnnotation(), this.type, null);
 			}

diff --git a/...h/e43/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/...h/e43/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -296,7 +296,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().typeMismatchError(typeBinding, scope.getJavaLangAnnotationAnnotation(), this.type, null);
 			}

diff --git a/...e43j8/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/...e43j8/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -725,7 +725,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().typeMismatchError(typeBinding, scope.getJavaLangAnnotationAnnotation(), this.type, null);
 			}

diff --git a/...h/e44/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/...h/e44/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -804,7 +804,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().typeMismatchError(typeBinding, scope.getJavaLangAnnotationAnnotation(), this.type, null);
 			}

diff --git a/...h/e45/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/...h/e45/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -804,7 +804,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().notAnnotationType(typeBinding, this.type);
 			}

diff --git a/...h/e46/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java b/...h/e46/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
@@ -803,7 +803,7 @@ public TypeBinding resolveType(BlockScope scope) {
 				// allow the Groovy annotation to show in Javadoc
 				// TODO: Does this cause unanticipated side effects?
 				this.compilerAnnotation = scope.environment().createAnnotation(
-						(ReferenceBinding) this.resolvedType, computeElementValuePairs());
+					(ReferenceBinding) this.resolvedType, Binding.NO_ELEMENT_VALUE_PAIRS);
 			} else {
 				scope.problemReporter().notAnnotationType(typeBinding, this.type);
 			}