aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java5
1 files changed, 5 insertions, 0 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 aac3ae533..2ba0dfec7 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
@@ -236,6 +236,11 @@ public class EclipseSourceType extends ResolvedTypeX.ConcreteName {
if (as == null) return false;
for (int i = 0; i < as.length; i++) {
Annotation annotation = as[i];
+ if (annotation.resolvedType == null) {
+ // Something has gone wrong - probably we have a 1.4 rt.jar around
+ // which will result in a separate error message.
+ return false;
+ }
String tname = CharOperation.charToString(annotation.resolvedType.constantPoolName());
if (TypeX.forName(tname).equals(ofType)) {
return true;