From c756375b4ad63b4dfeafb94abcd30fd64d2d99c6 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 16 Jun 2010 18:09:45 +0000
Subject: [PATCH] 310506: optional aspects

---
 .../src/org/aspectj/weaver/CrosscuttingMembersSet.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 		}
 
-- 
2.39.5