From: aclement <aclement>
Date: Sun, 25 Jun 2006 18:51:41 +0000 (+0000)
Subject: fix for 148536
X-Git-Tag: V1_5_2rc1~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ec9b7f9c79f7f1e5c2ae616b3fd290448a6ee8b5;p=aspectj.git

fix for 148536
---

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) {