merge: reconcile Bug 510471 with Bug 501364

 - the latter is not yet ported to master!

1 files changed, 1 insertions, 1 deletions

diff --git a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBindingRegistry.java b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBindingRegistry.java
index a4d2d49f7..3e7fad58b 100644
--- a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBindingRegistry.java
+++ b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBindingRegistry.java
@@ -177,7 +177,7 @@ public class AspectBindingRegistry {
 					log(IStatus.ERROR, "base bundle "+baseBundleId+" is not resolved - weaving may be incomplete.");
 				} else {
 					BundleWiring baseBundleWiring = baseBundles[0].adapt(BundleWiring.class);
-					Collection<String> boundBases = binding.scanTeamClasses(aspectBundle, DelegatingTransformer.newTransformer(OTWeavingHook.USE_DYNAMIC_WEAVER, hook, baseBundleWiring));
+					Collection<String> boundBases = binding.scanTeamClasses(aspectBundle, DelegatingTransformer.newTransformer(binding.weavingScheme, hook, baseBundleWiring));
 					addBoundBaseClasses(boundBases);
 				}
 			}