test and fix for 152257

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
index a30c716af211d28dde573e847f629266adb3866e..c436dd7c5716d3297dcded5b54fcfe0f79a5eaf5 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
@@ -190,7 +190,7 @@ public class AjCompilerAdapter extends AbstractCompilerAdapter {
                                notifyRequestor();
                        } else {
                                weave();  // notification happens as weave progresses...
-                               weaver.getWorld().flush();
+//                     weaver.getWorld().flush(); // pr152257
                        }
                } catch (IOException ex) {
                        AbortCompilation ac = new AbortCompilation(null,ex);

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
index 0f37c5f2f97ae59f26be2407817caa0c60591c98..dbc0a12a28375c10f4a781f74995834e30888415 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
@@ -346,7 +346,7 @@ public class AjPipeliningCompilerAdapter extends AbstractCompilerAdapter {
                                notifyRequestor();
                        } else {
                                // weave();  // notification happens as weave progresses...
-                               weaver.getWorld().flush();
+//                     weaver.getWorld().flush(); // pr152257
                        }
 //             } catch (IOException ex) {
 //                     AbortCompilation ac = new AbortCompilation(null,ex);

diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index ea2b8e9b244c68b7c44a4e4c87234959b6a7f1cf..511aa4e2268ae666862e463a4e4e7c5b49c59dee 100644 (file)
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -820,21 +820,20 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
        }
        
     //Bugzilla Bug 152257 - Incremental compiler doesn't handle exception declaration correctly
-/*     public void testPr152257() {
+       public void testPr152257() {
                configureNonStandardCompileOptions("-XnoInline");
-               super.VERBOSE=true;
                initialiseProject("PR152257");
                build("PR152257");
                List errors = MyTaskListManager.getErrorMessages();
                assertTrue("Should be no warnings, but there are #"+errors.size(),errors.size()==0);
-//             checkWasFullBuild();
+               checkWasFullBuild();
                alter("PR152257","inc1");
                build("PR152257");
                errors = MyTaskListManager.getErrorMessages();
                assertTrue("Should be no warnings, but there are #"+errors.size(),errors.size()==0);
-//             checkWasntFullBuild();
+               checkWasntFullBuild();
        }
-*/     
+
 
        public void testPr128655() {
                configureNonStandardCompileOptions("-showWeaveInfo");

diff --git a/weaver/src/org/aspectj/weaver/World.java b/weaver/src/org/aspectj/weaver/World.java
index 88a96a41b4c7a824ad395e4f6adbd0e04647675d..e1e663db0e8873a36717193a06d410386a9d69ac 100644 (file)
--- a/weaver/src/org/aspectj/weaver/World.java
+++ b/weaver/src/org/aspectj/weaver/World.java
@@ -1133,6 +1133,7 @@ public abstract class World implements Dump.INode {
     public void setAddSerialVerUID(boolean b) { addSerialVerUID=b;}
     public boolean isAddSerialVerUID() { return addSerialVerUID;}
     
+    /** be careful calling this - pr152257 */
        public void flush() {
                typeMap.expendableMap.clear();
        }