Bug 459512 - When ClassCircularity fails team activation, the freshly
created team instance is leaking
- respect equivalent set
diff --git a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBinding.java b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBinding.java
index 95b8525..8e9043f 100644
--- a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBinding.java
+++ b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBinding.java
@@ -218,9 +218,11 @@
 
 		/** Precondition: teamClass is set. Create fresh or answer existing. */
 		public Team getInstance() throws InstantiationException, IllegalAccessException {
-			Team inst = this.instance;
-			if (inst != null)
-				return inst;
+			for (TeamBinding equalivalent : this.equivalenceSet) {
+				Team inst = equalivalent.instance;
+				if (inst != null)
+					return inst;
+			}
 			Class<? extends Team> cl = this.teamClass;
 			assert cl != null : "Precondition";
 			@SuppressWarnings("null")@NonNull Team nnInst = cl.newInstance();
diff --git a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/TeamLoader.java b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/TeamLoader.java
index 48d4294..610864f 100644
--- a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/TeamLoader.java
+++ b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/TeamLoader.java
@@ -179,7 +179,8 @@
 	 */
 	@Nullable Team instantiateAndActivate(AspectBinding aspectBinding, TeamBinding team, ActivationKind activationKind)
 	{
-		if (team.instance != null && team.isActivated) return team.instance;
+		for (TeamBinding equivalent : team.equivalenceSet)
+			if (equivalent.instance != null && equivalent.isActivated) return equivalent.instance;
 
 		String teamName = team.teamName;
 		// don't try to instantiate before all base classes successfully loaded.