fixing an NPE that happens with invalid nested annotations

1 files changed, 10 insertions, 4 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/AnnotationContainerTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/AnnotationContainerTools.java
index b3ddfd6fd8..1b2a0e867e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/AnnotationContainerTools.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/AnnotationContainerTools.java
@@ -160,17 +160,20 @@ public final class AnnotationContainerTools {
 
 	/**
 	 * Add whatever annotations are represented by the specified expression to
-	 * the specified list. Add null to the list for any non-annotation expression.
+	 * the specified list. Do not add null to the list for any non-annotation expression.
 	 */
 	private static void addAstAnnotationsTo(Expression expression, String annotationName, ArrayList<Annotation> astAnnotations) {
 		if (expression == null) {
-			astAnnotations.add(null);  // not sure how we would get here...
+			//do not add null to the list, not sure how we would get here...
 		}
 		else if (expression.getNodeType() == ASTNode.ARRAY_INITIALIZER) {
 			addAstAnnotationsTo((ArrayInitializer) expression, annotationName, astAnnotations);
 		}
 		else {
-			astAnnotations.add(getAstAnnotation_(expression, annotationName));
+			Annotation astAnnotation = getAstAnnotation_(expression, annotationName);
+			if (astAnnotation != null) {
+				astAnnotations.add(astAnnotation);
+			}
 		}
 	}
 
@@ -178,7 +181,10 @@ public final class AnnotationContainerTools {
 		@SuppressWarnings("unchecked")
 		List<Expression> expressions = arrayInitializer.expressions();
 		for (Expression expression : expressions) {
-			astAnnotations.add(getAstAnnotation(expression, annotationName));
+			Annotation astAnnotation = getAstAnnotation(expression, annotationName);
+			if (astAnnotation != null) {
+				astAnnotations.add(astAnnotation);
+			}
 		}
 	}