aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhugunin <jhugunin>2003-01-14 22:10:10 +0000
committerjhugunin <jhugunin>2003-01-14 22:10:10 +0000
commitdd6a7bde18f00f528caa1bcb0abf8de9e9c4ab5c (patch)
treea4bfb581f4b035244979921ece354d2a58ce524d
parent2549404ca35f27cdef2bfedd91092e186c7029e5 (diff)
downloadaspectj-dd6a7bde18f00f528caa1bcb0abf8de9e9c4ab5c.tar.gz
aspectj-dd6a7bde18f00f528caa1bcb0abf8de9e9c4ab5c.zip
more careful null handling
-rw-r--r--weaver/src/org/aspectj/weaver/CrosscuttingMembers.java4
1 files 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;
}