From a3f3ae406d01081897b68c1344b4f23cbabaeed8 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Mon, 31 Jul 2006 15:05:05 +0000
Subject: [PATCH] test and fix for 152257

---
 .../ajdt/internal/compiler/AjCompilerAdapter.java        | 2 +-
 .../internal/compiler/AjPipeliningCompilerAdapter.java   | 2 +-
 .../incremental/tools/MultiProjectIncrementalTests.java  | 9 ++++-----
 weaver/src/org/aspectj/weaver/World.java                 | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

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 a30c716af..c436dd7c5 100644
--- 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 0f37c5f2f..dbc0a12a2 100644
--- 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 ea2b8e9b2..511aa4e22 100644
--- 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 88a96a41b..e1e663db0 100644
--- 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();
 	}
-- 
2.39.5