summaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2008-10-01 18:39:33 +0000
committeraclement <aclement>2008-10-01 18:39:33 +0000
commitb0234366ae48c3ac6c5f040e3d02ff553b79862b (patch)
tree283b1a9e3da4bd16d92fcced7b5714aeb61c168e /weaver
parent7a398a2d4cfe14c36662ac6b984303f8ba920362 (diff)
downloadaspectj-b0234366ae48c3ac6c5f040e3d02ff553b79862b.tar.gz
aspectj-b0234366ae48c3ac6c5f040e3d02ff553b79862b.zip
dont crash if other problems prevent annotation resolution
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/weaver/src/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java
index 66f36a229..0263035eb 100644
--- a/weaver/src/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java
@@ -76,6 +76,11 @@ public class ExactAnnotationFieldTypePattern extends ExactAnnotationTypePattern
cleanname = cleanname.substring(0, lastDot) + "$" + cleanname.substring(lastDot + 1);
}
annotationType = scope.getWorld().resolve(type, true);
+ if (ResolvedType.isMissing(annotationType)) {
+ // there are likely to be other errors around that have led to us being unable to
+ // resolve the annotation type, let's quit now
+ return this;
+ }
}
verifyIsAnnotationType((ResolvedType) annotationType, scope);