From: aclement <aclement>
Date: Mon, 24 Apr 2006 08:44:25 +0000 (+0000)
Subject: fix for 138143: npe on duplicate method for ataj
X-Git-Tag: V1_5_2rc1~191
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0d74ccfc6087a2bd8025c73e64467a4a8e442916;p=aspectj.git

fix for 138143: npe on duplicate method for ataj
---

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
index 18380cbe6..6ce6ceab0 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
@@ -186,7 +186,7 @@ public class EclipseSourceType extends AbstractReferenceTypeDelegate {
 				}  else if ((amd.annotations != null) && isAnnotationStylePointcut(amd.annotations)) {
 					// consider pointcuts defined via annotations
 					ResolvedPointcutDefinition df = makeResolvedPointcutDefinition(amd);
-					declaredPointcuts.add(df);
+					if (df!=null) declaredPointcuts.add(df);
 				} else {
 					if (amd.binding == null || !amd.binding.isValidBinding()) continue;
 					ResolvedMember member = factory.makeResolvedMember(amd.binding);
@@ -214,6 +214,7 @@ public class EclipseSourceType extends AbstractReferenceTypeDelegate {
 	}
 
 	private ResolvedPointcutDefinition makeResolvedPointcutDefinition(AbstractMethodDeclaration md) {
+		if (md.binding==null) return null; // there is another error that has caused this... pr138143
 		ResolvedPointcutDefinition resolvedPointcutDeclaration = new ResolvedPointcutDefinition(
             factory.fromBinding(md.binding.declaringClass), 
             md.modifiers,