Bug 510466: [otdre] binding to indirectly inherited base method is not

activated
- excluding changes in o.e.o.jdt.ui

1 files changed, 11 insertions, 7 deletions

diff --git a/plugins/org.eclipse.objectteams.runtime/src/org/eclipse/objectteams/otredyn/runtime/TeamManager.java b/plugins/org.eclipse.objectteams.runtime/src/org/eclipse/objectteams/otredyn/runtime/TeamManager.java
index 93b17184d..e49742cf0 100644
--- a/plugins/org.eclipse.objectteams.runtime/src/org/eclipse/objectteams/otredyn/runtime/TeamManager.java
+++ b/plugins/org.eclipse.objectteams.runtime/src/org/eclipse/objectteams/otredyn/runtime/TeamManager.java
@@ -181,14 +181,9 @@ public class TeamManager implements ITeamManager {
 
 	private void handleBindingForBase(ITeam t, ITeamManager.TeamStateChange stateChange, IBinding binding, IBoundClass boundClass, IClassIdentifierProvider provider) {
 		IMethod method = boundClass.getMethod(binding.getMemberName(), binding.getMemberSignature(), binding.getBaseFlags(), binding.isHandleCovariantReturn());
-		int joinpointId = getJoinpointId(boundClass
-				.getMethodIdentifier(method));
+		int joinpointId = getJoinpointId(boundClass.getMethodIdentifier(method));
 		synchronized (method) {
-			changeTeamsForJoinpoint(t, binding.getPerTeamId(), joinpointId, stateChange);
-			List<Integer> subJoinpoints = joinpointToSubJoinpoints.get(joinpointId);
-			if (subJoinpoints != null)
-				for (Integer subJoinpoint : subJoinpoints)
-					changeTeamsForJoinpoint(t, binding.getPerTeamId(), subJoinpoint, stateChange);
+			stateChangeForJoinpoint(t, stateChange, binding, boundClass, method, joinpointId);
 		}
 		boundClass.handleAddingOfBinding(binding); // TODO: do we want/need to group all bindings into one action?
 
@@ -196,6 +191,15 @@ public class TeamManager implements ITeamManager {
 			handleBindingForBase(t, stateChange, binding, tsubBase, provider);
 		}
 	}
+
+	private void stateChangeForJoinpoint(ITeam t, ITeamManager.TeamStateChange stateChange, IBinding binding,
+			IBoundClass boundClass, IMethod method, int joinpointId) {
+		changeTeamsForJoinpoint(t, binding.getPerTeamId(), joinpointId, stateChange);
+		List<Integer> subJoinpoints = joinpointToSubJoinpoints.get(joinpointId);
+		if (subJoinpoints != null)
+			for (Integer subJoinpoint : subJoinpoints)
+				stateChangeForJoinpoint(t, stateChange, binding, boundClass, method, subJoinpoint);
+	}
 	
 	/**
 	 * When a team is about to be activated propagate its bindings to all base classes,