diff options
| author | Andy Clement <aclement@pivotal.io> | 2016-01-08 11:49:22 -0800 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2016-01-08 11:49:22 -0800 |
| commit | e3d5df726f39207ae93de93e4389dd004c93984c (patch) | |
| tree | 2440240004af0780d1e003222d5a333d303fc1e1 | |
| parent | c59054c24783df26d85990dcfbb86a4875f54586 (diff) | |
| download | aspectj-e3d5df726f39207ae93de93e4389dd004c93984c.tar.gz aspectj-e3d5df726f39207ae93de93e4389dd004c93984c.zip | |
Fix 485448: Building Roo projects NPE in AnnotationDiscoveryVisitor
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java | 3 | ||||
| -rw-r--r-- | org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip | bin | 4561939 -> 4562055 bytes | |||
| -rw-r--r-- | org.eclipse.jdt.core/jdtcore-for-aspectj.jar | bin | 8499260 -> 8499628 bytes |
3 files changed, 3 insertions, 0 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java index 7a27b709a..52ad76f5b 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java @@ -1167,6 +1167,9 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC System.arraycopy(abefore, 0, newset, toAdd.length, abefore.length); } sourceType.scope.referenceContext.annotations = newset; + if ((sourceType.tagBits & TagBits.AnnotationResolved)!=0) { + sourceType.tagBits = sourceType.tagBits - TagBits.AnnotationResolved; + } CompilationAndWeavingContext.leavingPhase(tok); if (factory.pushinCollector != null) { factory.pushinCollector.tagAsMunged(sourceType, new CommonPrinter((methodDecl == null ? null : methodDecl.scope)) diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip Binary files differindex 03e2e018c..244c9b589 100644 --- a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip +++ b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar Binary files differindex 7303f6c13..5fcb28e34 100644 --- a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar +++ b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar |