fix for Bugzilla Bug 59895

 	NPE updating an aspect in incremental mode

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 608aea62d91db9d9bd642a09188d74904e91ef93..b05092ca286106c719b1a30408a5c721d0cf6bd3 100644 (file)
--- 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 efffb7547269a4c8b4af9403ade1d33304441045..3f9e7cc1ce1de3be0a2cc161bb56fbc65ecd76de 100644 (file)
--- 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 48879067d2ba1ddc6c63b45226151c4b3041a3a3..c2493c0d49c928006108e03968bb402baa6f86d6 100644 (file)
--- 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>