aboutsummaryrefslogtreecommitdiffstats
path: root/org.aspectj.matcher
diff options
context:
space:
mode:
authoraclement <aclement>2010-06-16 18:09:45 +0000
committeraclement <aclement>2010-06-16 18:09:45 +0000
commitc756375b4ad63b4dfeafb94abcd30fd64d2d99c6 (patch)
tree74497f5d0c7e3d5e7cce81b6636bb67317ab6e2a /org.aspectj.matcher
parentaadb8b8a596c5321b4dd1b3b21d355601c72379e (diff)
downloadaspectj-c756375b4ad63b4dfeafb94abcd30fd64d2d99c6.tar.gz
aspectj-c756375b4ad63b4dfeafb94abcd30fd64d2d99c6.zip
310506: optional aspects
Diffstat (limited to 'org.aspectj.matcher')
-rw-r--r--org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java b/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java
index e321e222d..59bd2c097 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java
@@ -75,7 +75,7 @@ public class CrosscuttingMembersSet {
*/
public boolean addOrReplaceAspect(ResolvedType aspectType, boolean inWeavingPhase) {
- if (!world.isAspectIncluded(aspectType)) {
+ if (!world.isAspectIncluded(aspectType) || world.hasUnsatisfiedDependency(aspectType)) {
return false;
}