aboutsummaryrefslogtreecommitdiffstats
path: root/org.aspectj.ajdt.core
diff options
context:
space:
mode:
authorAndy Clement <aclement@pivotal.io>2016-01-05 13:06:22 -0800
committerAndy Clement <aclement@pivotal.io>2016-01-05 13:06:22 -0800
commitd9029474077ebd405ec34d44913eed3051f2691e (patch)
tree7a6ff9cb209f4fbe15696e3ef31b11c32f0f5fe3 /org.aspectj.ajdt.core
parent9b220fe52ad9bb117140692f7cf455d78a17be11 (diff)
downloadaspectj-d9029474077ebd405ec34d44913eed3051f2691e.tar.gz
aspectj-d9029474077ebd405ec34d44913eed3051f2691e.zip
Fix 484941 - NPE AnnotationDiscoveryVisitor
Diffstat (limited to 'org.aspectj.ajdt.core')
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
index 00f7f8d8c..77410281b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
@@ -646,10 +646,8 @@ public class AjPipeliningCompilerAdapter extends AbstractCompilerAdapter {
return true; // code style
} else if (declaration.annotations != null) { // check for annotation style
for (int index = 0; index < declaration.annotations.length; index++) {
- TypeDeclaration
- .resolveAnnotations(declaration.staticInitializerScope, declaration.annotations, declaration.binding); // force
- // annotation
- // resolution
+ // Cause annotation resolution
+ declaration.binding.getAnnotationTagBits();
Annotation a = declaration.annotations[index];
if (a.resolvedType == null) {
continue; // another problem is being reported, so don't crash here