propoogating Erik's changes to AbortException

diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc10.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc10.java
index 7c79d028486690c96f21c4c89b281fccf57bd052..cacf88627ff50a14aa92403a92041bad1dbe32fe 100644 (file)
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc10.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc10.java
@@ -592,7 +592,7 @@ public class Ajc10 extends MatchingTask {
         } catch (Throwable t) {
             while (t instanceof AbortException) {
                 // check for "just quit -- message printed already"
-                if (AbortException.ABORT.equals(t)) { 
+                if (((AbortException)t).isSilent()) { 
                     t = null;
                     break;
                 }

diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
index c4e87f3de1238fe04519209b90049e235b3a0581..64b7d04db52f9548e113b65522946f0be64b8484 100644 (file)
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/Ajc11CompilerAdapter.java
@@ -88,7 +88,7 @@ public class Ajc11CompilerAdapter extends DefaultCompilerAdapter {
         } catch (BuildException e) {
             throw e;
         } catch (AbortException x) {
-            if (AbortException.ABORT.equals(x)) { // no message, just return
+            if (x.isSilent()) { // no message, just return
                 return false;
             } else {
                 Throwable t = x.getThrown();