summaryrefslogtreecommitdiffstats
path: root/org.aspectj.ajdt.core/src
diff options
context:
space:
mode:
authoraclement <aclement>2006-06-25 18:51:41 +0000
committeraclement <aclement>2006-06-25 18:51:41 +0000
commitec9b7f9c79f7f1e5c2ae616b3fd290448a6ee8b5 (patch)
tree5e2ab9129f2bcddae764c7fccf86a4eecc3923c4 /org.aspectj.ajdt.core/src
parent75a17318a97a8528c2604ada7ce159b3e46f12a6 (diff)
downloadaspectj-ec9b7f9c79f7f1e5c2ae616b3fd290448a6ee8b5.tar.gz
aspectj-ec9b7f9c79f7f1e5c2ae616b3fd290448a6ee8b5.zip
fix for 148536
Diffstat (limited to 'org.aspectj.ajdt.core/src')
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index 2b966d374..61aa3ec4d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -803,7 +803,8 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
TypeDeclaration typeDecl = ((SourceTypeBinding)mbs[0].declaringClass).scope.referenceContext;
AbstractMethodDeclaration methodDecl = typeDecl.declarationOf(mbs[0]);
toAdd = methodDecl.annotations; // this is what to add
- abits = toAdd[0].resolvedType.getAnnotationTagBits();
+ if (toAdd[0].resolvedType!=null) // pr148536
+ abits = toAdd[0].resolvedType.getAnnotationTagBits();
}
if (sourceType instanceof BinaryTypeBinding) {