From: jhugunin Date: Tue, 17 Dec 2002 00:32:49 +0000 (+0000) Subject: propoogating Erik's changes to AbortException X-Git-Tag: V_1_1_b2~75 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f68a0546db571904177e905ba81735bf7f81c9c9;p=aspectj.git 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 7c79d0284..cacf88627 100644 --- 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 c4e87f3de..64b7d04db 100644 --- 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();