diff options
| author | kmoore | 2010-08-23 17:07:51 +0000 |
|---|---|---|
| committer | kmoore | 2010-08-23 17:07:51 +0000 |
| commit | 5efe124b3997bc992419ffe24c812deb04e8f328 (patch) | |
| tree | ee47176742dc3fa518e8a88579ab8303e080d593 /jpa/plugins | |
| parent | c6157db37e3da23320e3d5bad580a2867c492d05 (diff) | |
| download | webtools.dali-5efe124b3997bc992419ffe24c812deb04e8f328.tar.gz webtools.dali-5efe124b3997bc992419ffe24c812deb04e8f328.tar.xz webtools.dali-5efe124b3997bc992419ffe24c812deb04e8f328.zip | |
323005 - NPE in AnnotationContainerTools with invalid nested annotation name
Diffstat (limited to 'jpa/plugins')
| -rw-r--r-- | jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/AnnotationContainerTools.java | 2 |
1 files changed, 1 insertions, 1 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 2510e2128a..b3ddfd6fd8 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 @@ -136,7 +136,7 @@ public final class AnnotationContainerTools { private static <T extends NestableAnnotation> ArrayList<Annotation> getNestedAstAnnotations(CompilationUnit astRoot, AnnotationContainer<T> annotationContainer) { ArrayList<Annotation> result = new ArrayList<Annotation>(); Annotation astContainerAnnotation = annotationContainer.getAstAnnotation(astRoot); - if (astContainerAnnotation.isMarkerAnnotation()) { + if (astContainerAnnotation == null || astContainerAnnotation.isMarkerAnnotation()) { // no nested annotations } else if (astContainerAnnotation.isSingleMemberAnnotation()) { |