diff options
author | avasseur <avasseur> | 2005-08-11 09:22:07 +0000 |
---|---|---|
committer | avasseur <avasseur> | 2005-08-11 09:22:07 +0000 |
commit | 875cccb16ae5db0e24abd97fab1234f01b2cc5b4 (patch) | |
tree | 727de7001fbbeb8ff6066bec6342cbab85edeb3d /bridge | |
parent | 5735e966959da60fcacebb23e8b5463c4138020c (diff) | |
download | aspectj-875cccb16ae5db0e24abd97fab1234f01b2cc5b4.tar.gz aspectj-875cccb16ae5db0e24abd97fab1234f01b2cc5b4.zip |
add test for proxy weaving and jit class weaving, update ltw doc
Diffstat (limited to 'bridge')
-rw-r--r-- | bridge/src/org/aspectj/bridge/MessageWriter.java | 2 | ||||
-rw-r--r-- | bridge/src/org/aspectj/bridge/Version.java | 20 |
2 files changed, 10 insertions, 12 deletions
diff --git a/bridge/src/org/aspectj/bridge/MessageWriter.java b/bridge/src/org/aspectj/bridge/MessageWriter.java index bc9530314..b01940325 100644 --- a/bridge/src/org/aspectj/bridge/MessageWriter.java +++ b/bridge/src/org/aspectj/bridge/MessageWriter.java @@ -42,7 +42,7 @@ public class MessageWriter implements IMessageHandler { if (null != result) { writer.println(result); writer.flush(); - if (abortOnFailure + if (abortOnFailure && (message.isFailed() || message.isAbort())) { throw new AbortException(message); } diff --git a/bridge/src/org/aspectj/bridge/Version.java b/bridge/src/org/aspectj/bridge/Version.java index b24fb7983..b729ef55b 100644 --- a/bridge/src/org/aspectj/bridge/Version.java +++ b/bridge/src/org/aspectj/bridge/Version.java @@ -37,7 +37,7 @@ public class Version { * Time text set by build script using SIMPLE_DATE_FORMAT. * (if DEVELOPMENT version, invalid) */ - public static final String time_text = ""; + public static final String time_text = "mardi juil. 5, 2005 at 09:56:18 GMT"; /** * time in seconds-since-... format, used by programmatic clients. @@ -46,20 +46,18 @@ public class Version { public static final long time; /** format used by build script to set time_text */ - public static final String SIMPLE_DATE_FORMAT = "MM/dd/yy 'at' hh:mm:ss z"; + public static final String SIMPLE_DATE_FORMAT = "EEEE MMM d, yyyy 'at' HH:mm:ss z"; // if not DEVELOPMENT version, read time text using format used to set time static { long foundTime = NOTIME; - if (!DEVELOPMENT.equals(text)) { - try { - SimpleDateFormat format = new SimpleDateFormat(SIMPLE_DATE_FORMAT); - ParsePosition pos = new ParsePosition(0); - Date date = format.parse(time_text, pos); - foundTime = date.getTime(); - } catch (Throwable t) { - } - } + try { + SimpleDateFormat format = new SimpleDateFormat(SIMPLE_DATE_FORMAT); + ParsePosition pos = new ParsePosition(0); + Date date = format.parse(time_text, pos); + foundTime = date.getTime(); + } catch (Throwable t) { + } time = foundTime; } |