summaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2005-09-13 16:44:55 +0000
committeraclement <aclement>2005-09-13 16:44:55 +0000
commitbddda4072f25bdcd680e5f167a1faed145066f93 (patch)
tree65ea843332feea5b1a62c04beac9fbfb11ad8eb0 /weaver
parent40f576dc2de1a0ceb7e3eb6857680c72b187e5ce (diff)
downloadaspectj-bddda4072f25bdcd680e5f167a1faed145066f93.tar.gz
aspectj-bddda4072f25bdcd680e5f167a1faed145066f93.zip
To fix one of Matthews problems with FFDC binary compatibility (AJ5 chokes on a 1.2.1 library): fixed the ordering back to what it was for 1.2.1 - shouldn't have moved NONE as it represents an empty pointcut expression (e.g. 'pointcut ffdcScope();' which is valid) - without this change to the old ordering we were interpreting 20 (which is what the FFDC pointcut had written out) as @args and then choking on processing it.
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/patterns/Pointcut.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/weaver/src/org/aspectj/weaver/patterns/Pointcut.java b/weaver/src/org/aspectj/weaver/patterns/Pointcut.java
index 9b0a8a79a..2ae97f3ae 100644
--- a/weaver/src/org/aspectj/weaver/patterns/Pointcut.java
+++ b/weaver/src/org/aspectj/weaver/patterns/Pointcut.java
@@ -211,9 +211,10 @@ public abstract class Pointcut extends PatternNode implements PointcutExpression
public static final byte ATWITHIN = 17;
public static final byte ATWITHINCODE = 18;
public static final byte ATTHIS_OR_TARGET = 19;
- public static final byte ATARGS = 20;
- public static final byte NONE = 40;
+ public static final byte NONE = 20; // DO NOT CHANGE OR REORDER THIS SEQUENCE, THIS VALUE CAN BE PUT OUT BY ASPECTJ1.2.1
+
+ public static final byte ATARGS = 21;
public byte getPointcutKind() { return pointcutKind; }