summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
index 19327ed80..06d3191fd 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
@@ -281,7 +281,13 @@ public class AsmHierarchyBuilder extends ASTVisitor {
if (Arrays.equals(annotation.type.getTypeBindingPublic(scope).signature(), "Lorg/aspectj/lang/annotation/Aspect;"
.toCharArray())) {
kind = IProgramElement.Kind.ASPECT;
- } else {
+ } else if(annotation.resolvedType != null) {
+ // Fix for the case where in a privileged aspect a parent declaration :
+ // declare parents: (@A C+) implements (B);
+ // is causing the resolvedType to be null when it shouldn't
+ // for the aspect and privileged annotation of that aspect.
+
+
// Creating the char[][] needed for ImportReference
String[] temp = (new String(annotation.resolvedType.constantPoolName())).split("/");
if (temp.length > 1) {