test and fix for 123612 - remember to clear the caches for declared annotations betwe...

diff --git a/tests/multiIncremental/PR123612/base/A.aj b/tests/multiIncremental/PR123612/base/A.aj
new file mode 100644 (file)
index 0000000..e11939e
--- /dev/null
+++ b/tests/multiIncremental/PR123612/base/A.aj
@@ -0,0 +1,8 @@
+public aspect A {
+       declare @type : C : @MyAnnotation;
+}
+@interface MyAnnotation {      
+}
+
+class C {
+}

diff --git a/tests/multiIncremental/PR123612/inc1/A.aj b/tests/multiIncremental/PR123612/inc1/A.aj
new file mode 100644 (file)
index 0000000..37ff167
--- /dev/null
+++ b/tests/multiIncremental/PR123612/inc1/A.aj
@@ -0,0 +1,8 @@
+public aspect A {
+//     declare @type : C : @MyAnnotation;
+}
+@interface MyAnnotation {      
+}
+
+class C {
+}

diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index ebd34910c33952500296b5d329abf016293e76d6..4ae317a6984cf6ad2333295dfd9b5e908bb3ff81 100644 (file)
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -466,7 +466,14 @@ public class MultiProjectIncrementalTests extends AjdeInteractionTestbed {
                alter("PR113257","inc1");
                build("PR113257");
        }
-       
+
+       public void testPr123612() {
+               initialiseProject("PR123612");
+               build("PR123612");
+               alter("PR123612","inc1");
+               build("PR123612");
+               checkWasntFullBuild();
+       }
        
        // other possible tests:
        // - memory usage (freemem calls?)

diff --git a/weaver/src/org/aspectj/weaver/CrosscuttingMembersSet.java b/weaver/src/org/aspectj/weaver/CrosscuttingMembersSet.java
index 5f9eaf1f02db85220e6630b00d136c396e719461..cbaff05eae91c9285641ae0020c0af46bdb2e596 100644 (file)
--- a/weaver/src/org/aspectj/weaver/CrosscuttingMembersSet.java
+++ b/weaver/src/org/aspectj/weaver/CrosscuttingMembersSet.java
@@ -127,6 +127,9 @@ public class CrosscuttingMembersSet {
         lateTypeMungers = null;
                declareSofts = null;
                declareParents = null;
+               declareAnnotationOnFields=null;
+               declareAnnotationOnMethods=null;
+               declareAnnotationOnTypes=null;
                declareDominates = null;
        }