310506: optional aspects

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java b/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java
index e321e222d7461beed1daf38faf302b66a1d74be6..59bd2c0973de63e68875453e445ed9b7c243e727 100644 (file)
--- 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;
                }