From dd6a7bde18f00f528caa1bcb0abf8de9e9c4ab5c Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Tue, 14 Jan 2003 22:10:10 +0000
Subject: [PATCH] more careful null handling

---
 weaver/src/org/aspectj/weaver/CrosscuttingMembers.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java b/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java
index 876a21070..21be96474 100644
--- a/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java
+++ b/weaver/src/org/aspectj/weaver/CrosscuttingMembers.java
@@ -154,8 +154,8 @@ public class CrosscuttingMembers {
 
 	public boolean replaceWith(CrosscuttingMembers other) {
 		boolean changed = false;
-		//XXX what if perClause is null
-		if (!perClause.equals(other.perClause)) {
+		
+		if (perClause == null || !perClause.equals(other.perClause)) {
 			changed = true;
 			perClause = other.perClause;
 		}
-- 
2.39.5