From 58436592bb9fe64341d9013779fe377bb55a24e2 Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Fri, 5 Sep 2003 03:58:13 +0000
Subject: 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.
---
 weaver/src/org/aspectj/weaver/ResolvedTypeX.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'weaver/src')

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());
     }
     
-- 
cgit v1.2.3