diff options
| author | acolyer <acolyer> | 2004-04-26 09:53:45 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2004-04-26 09:53:45 +0000 |
| commit | a4fef441489604938a313b2beac300df315c1709 (patch) | |
| tree | 8c85f4923a1bdd9d79b25bf5d9a5d12b6324844c | |
| parent | 591e8fd6d22f308af87ed766884e4e5e8ceaba09 (diff) | |
| download | aspectj-a4fef441489604938a313b2beac300df315c1709.tar.gz aspectj-a4fef441489604938a313b2beac300df315c1709.zip | |
fix for Bugzilla Bug 59895
NPE updating an aspect in incremental mode
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java | 3 | ||||
| -rw-r--r-- | tests/ajcTests.xml | 15 | ||||
| -rw-r--r-- | 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> |