summaryrefslogtreecommitdiffstats
path: root/weaver/src
diff options
context:
space:
mode:
authorjhugunin <jhugunin>2003-09-05 03:58:13 +0000
committerjhugunin <jhugunin>2003-09-05 03:58:13 +0000
commit58436592bb9fe64341d9013779fe377bb55a24e2 (patch)
treeaf4f40b4ae6b0943fa45cb3e755b3ed25f618306 /weaver/src
parent8660cc12bfbcd6f4957abd4dfc84735de6c048cf (diff)
downloadaspectj-58436592bb9fe64341d9013779fe377bb55a24e2.tar.gz
aspectj-58436592bb9fe64341d9013779fe377bb55a24e2.zip
test and fix for bug reported today on aspectj-dev
This bug is a reversion from 1.1.0 and so was a high-priority to get fixed before the 1.1.1rc2 release tommorrow. The bug was caused by a conflict between the implementation of perthis and a fix made in 1.1.1rc1 to the code for signature matching to handle inter-type declarations correctly. The fix was the addition of two null pointer checks. I hope that the original reporter will file a bug report in bugzilla tomorrow for tracking.
Diffstat (limited to 'weaver/src')
-rw-r--r--weaver/src/org/aspectj/weaver/ResolvedTypeX.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
index 1861254a5..e3504fcbe 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedTypeX.java
@@ -242,6 +242,8 @@ public abstract class ResolvedTypeX extends TypeX {
public static boolean matches(Member m1, Member m2) {
+ if (m1 == null) return m2 == null;
+ if (m2 == null) return false;
return m1.getName().equals(m2.getName()) && m1.getSignature().equals(m2.getSignature());
}