From a4fef441489604938a313b2beac300df315c1709 Mon Sep 17 00:00:00 2001
From: acolyer <acolyer>
Date: Mon, 26 Apr 2004 09:53:45 +0000
Subject: [PATCH] fix for Bugzilla Bug 59895  	NPE updating an aspect in
 incremental mode

---
 .../internal/core/builder/AjBuildManager.java    |  3 ++-
 tests/ajcTests.xml                               | 15 +++++++++++++++
 tests/ajcTestsFailing.xml                        | 16 +---------------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 608aea62d..b05092ca2 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -205,7 +205,8 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc
         		closeOutputStream();
         	}
             ret = !handler.hasErrors();
-            handler = null;
+            // bug 59895, don't release reference to handler as may be needed by a nested call
+            //handler = null;
         }
         return ret;
     }
diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index efffb7547..3f9e7cc1c 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -7665,6 +7665,21 @@
         	<message kind="error" line="2"/>
         </compile>
     </ajc-test>
+
+  <ajc-test dir="incremental/full-rebuild"
+    	pr="59895"
+		title="incremental with aspect-driven full rebuild">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental">
+        	<message kind="error" line="3" file="Aspect.java"/>
+        	</compile>
+        <inc-compile tag="20">
+        	<message kind="warning" line="4" file="Main.java"/>
+        	</inc-compile>
+        <run class="Main"/>
+    </ajc-test>
 	
 	<ajc-test dir="bugs"
     	pr="59397"
diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index 48879067d..c2493c0d4 100644
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -133,19 +133,5 @@
         <run class="InterfaceInitializerOrder"/>
     </ajc-test>
 
-    <ajc-test dir="incremental/full-rebuild"
-    	pr="59895"
-		title="incremental with aspect-driven full rebuild">
-        <compile 
-			staging="true" 
-			sourceroots="src"
-			options="-incremental">
-        	<message kind="error" line="3" file="Aspect.java"/>
-        	</compile>
-        <inc-compile tag="20">
-        	<message kind="warning" line="4" file="Main.java"/>
-        	</inc-compile>
-        <run class="Main"/>
-    </ajc-test>
-
+  
 </suite>
-- 
2.39.5