Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2017-01-15 19:06:43 +0000
committerStephan Herrmann2017-01-15 19:06:43 +0000
commit269d33d636b2d7eee044fdaa4bc133df0c5b72d5 (patch)
tree3dd10934ab5342b38088208f5c40d2b464077885
parent7c515e360b054f04b17197f346dc61302017a085 (diff)
downloadorg.eclipse.objectteams-269d33d636b2d7eee044fdaa4bc133df0c5b72d5.tar.gz
org.eclipse.objectteams-269d33d636b2d7eee044fdaa4bc133df0c5b72d5.tar.xz
org.eclipse.objectteams-269d33d636b2d7eee044fdaa4bc133df0c5b72d5.zip
merge: reconcile Bug 510471 with Bug 501364
- the latter is not yet ported to master!
-rw-r--r--plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBindingRegistry.java2
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);
}
}

Back to the top