diff options
author | Thomas Watson | 2016-01-11 14:25:15 +0000 |
---|---|---|
committer | Thomas Watson | 2016-01-11 14:51:00 +0000 |
commit | 131f07ce89bdab182d6e6203dcc5afd9bcc4a4a2 (patch) | |
tree | b40edefac4bde322b95027275ebc0c24e37820da | |
parent | af0b69f307193a1140cb14056b1d6e3e2008fc65 (diff) | |
download | rt.equinox.framework-131f07ce89bdab182d6e6203dcc5afd9bcc4a4a2.tar.gz rt.equinox.framework-131f07ce89bdab182d6e6203dcc5afd9bcc4a4a2.tar.xz rt.equinox.framework-131f07ce89bdab182d6e6203dcc5afd9bcc4a4a2.zip |
Bug 485217 - Update resolver implementation and default to using batch resolves with a timeout
Update the Resolver service registration to be single threaded.
Update the Resolver service registration to use Min service ranking.
Some ResolveContext impls are not ready to be multi-threaded.
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java index 45e4deeb2..01d3b4fd4 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2015 IBM Corporation and others. + * Copyright (c) 2003, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -73,11 +73,13 @@ public class SystemBundleActivator implements BundleActivator { register(bc, PermissionAdmin.class, sa, null); register(bc, ConditionalPermissionAdmin.class, sa, null); - register(bc, Resolver.class, new ResolverImpl(new Logger(0)), false, null); + Hashtable<String, Object> props = new Hashtable<String, Object>(7); + props.clear(); + props.put(Constants.SERVICE_RANKING, Integer.MIN_VALUE); + register(bc, Resolver.class, new ResolverImpl(new Logger(0), null), false, props); register(bc, DebugOptions.class, dbgOptions, null); - Hashtable<String, Object> props = new Hashtable<String, Object>(7); if (tccl != null) { props.clear(); props.put("equinox.classloader.type", "contextClassLoader"); //$NON-NLS-1$ //$NON-NLS-2$ |