diff options
author | aclement <aclement> | 2004-12-03 15:35:18 +0000 |
---|---|---|
committer | aclement <aclement> | 2004-12-03 15:35:18 +0000 |
commit | da4981ea929f0503a3995435456de0a963f206db (patch) | |
tree | 65a6427c6144c3e92827087621ac98e72d038997 /weaver | |
parent | 7864547200c9b7e8b0535ae92be2d558e23b98f8 (diff) | |
download | aspectj-da4981ea929f0503a3995435456de0a963f206db.tar.gz aspectj-da4981ea929f0503a3995435456de0a963f206db.zip |
72766 - avoid the potential NPE !
Diffstat (limited to 'weaver')
-rw-r--r-- | weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java b/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java index fef2dc122..905d2a627 100644 --- a/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java +++ b/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java @@ -119,11 +119,6 @@ public class SignaturePattern extends PatternNode { ResolvedMember sig = member.resolve(world); - // Java5 introduces bridge methods, we don't want to match on them at all... - if (sig.isBridgeMethod()) { - return false; - } - if (sig == null) { //XXX if (member.getName().startsWith(NameMangler.PREFIX)) { @@ -133,6 +128,11 @@ public class SignaturePattern extends PatternNode { return false; } + // Java5 introduces bridge methods, we don't want to match on them at all... + if (sig.isBridgeMethod()) { + return false; + } + // This check should only matter when used from WithincodePointcut as KindedPointcut // has already effectively checked this with the shadows kind. if (kind != member.getKind()) { |