From 7dbb9f7d56b887cbd82021d5c3a3c5e8c1f3cfa7 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Mon, 20 Jun 2011 17:11:24 +0000
Subject: [PATCH] 349786

---
 .../ajdt/internal/compiler/lookup/EclipseSourceType.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 4e1a57769..ab743177f 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
@@ -335,8 +335,8 @@ public class EclipseSourceType extends AbstractReferenceTypeDelegate {
 		FormalBinding[] bindings = buildFormalAdviceBindingsFrom(md);
 
 		ResolvedPointcutDefinition rpd = new LazyResolvedPointcutDefinition(factory.fromBinding(md.binding.declaringClass),
-				md.modifiers, new String(md.selector), factory.fromBindings(md.binding.parameters), factory
-						.fromBinding(md.binding.returnType), pc, new EclipseScope(bindings, md.scope));
+				md.modifiers, new String(md.selector), factory.fromBindings(md.binding.parameters),
+				factory.fromBinding(md.binding.returnType), pc, new EclipseScope(bindings, md.scope));
 
 		rpd.setPosition(md.sourceStart, md.sourceEnd);
 		rpd.setSourceContext(eSourceContext);
@@ -822,7 +822,7 @@ public class EclipseSourceType extends AbstractReferenceTypeDelegate {
 				// if (defaultValue instanceof FalseLiteral) {
 				// new AnnotationValue
 				// } else if (defaultValue instanceof TrueLiteral) {
-				//					
+				//
 				// } else {
 				// throw new MissingImplementationException(
 				// "Please raise an AspectJ bug.  AspectJ does not know how to convert this annotation value ["
@@ -897,7 +897,8 @@ public class EclipseSourceType extends AbstractReferenceTypeDelegate {
 		Annotation[] annotations = typeDeclaration.annotations;
 		for (int i = 0; i < annotations.length; i++) {
 			Annotation annotation = annotations[i];
-			if (CharOperation.equals(aspectSig, annotation.resolvedType.signature())) {
+			if (annotation != null && annotation.resolvedType != null
+					&& CharOperation.equals(aspectSig, annotation.resolvedType.signature())) {
 				// found @Aspect(...)
 				if (annotation.memberValuePairs() == null || annotation.memberValuePairs().length == 0) {
 					// it is an @Aspect or @Aspect()
-- 
2.39.5