Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2008-09-08 18:03:26 +0000
committerThomas Watson2008-09-08 18:03:26 +0000
commit6c7c7c4b6ce28fa897cbd1f0803ce3bbce01939c (patch)
treed1e1d5f2fbf7922566a456dce9f0e43b7fae8de8
parentb35fdfa4c3348db27cbfa06a6c2fc22c9dff687d (diff)
downloadrt.equinox.framework-6c7c7c4b6ce28fa897cbd1f0803ce3bbce01939c.tar.gz
rt.equinox.framework-6c7c7c4b6ce28fa897cbd1f0803ce3bbce01939c.tar.xz
rt.equinox.framework-6c7c7c4b6ce28fa897cbd1f0803ce3bbce01939c.zip
Bug 246574
- need to keep osgi.compatibility.bootdelegation = true by default.
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java2
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java5
2 files changed, 2 insertions, 5 deletions
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
index 8ad79f415..beee5a766 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/Framework.java
@@ -104,7 +104,7 @@ public class Framework implements EventDispatcher, EventPublisher, Runnable {
private String[] bootDelegationStems;
private boolean bootDelegateAll = false;
public final boolean contextBootDelegation = "true".equals(FrameworkProperties.getProperty("osgi.context.bootdelegation", "true")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- public final boolean compatibiltyBootDelegation = "true".equals(FrameworkProperties.getProperty(Constants.OSGI_COMPATIBILITY_BOOTDELEGATION)); //$NON-NLS-1$
+ public final boolean compatibiltyBootDelegation = "true".equals(FrameworkProperties.getProperty(Constants.OSGI_COMPATIBILITY_BOOTDELEGATION, "true")); //$NON-NLS-1$ //$NON-NLS-2$
ClassLoaderDelegateHook[] delegateHooks;
private volatile boolean forcedRestart = false;
/**
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
index 48566e956..ef46e776d 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
@@ -23,7 +23,6 @@ import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor;
import org.eclipse.osgi.framework.console.CommandProvider;
import org.eclipse.osgi.framework.debug.Debug;
import org.eclipse.osgi.framework.debug.FrameworkDebugOptions;
-import org.eclipse.osgi.framework.internal.core.Constants;
import org.eclipse.osgi.framework.log.FrameworkLog;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
import org.eclipse.osgi.internal.baseadaptor.AdaptorUtil;
@@ -156,9 +155,7 @@ public class EclipseAdaptorHook implements AdaptorHook, HookConfigurator {
}
public void addProperties(Properties properties) {
- // default to enable compatibility boot delegation
- if (properties.getProperty(Constants.OSGI_COMPATIBILITY_BOOTDELEGATION) == null)
- properties.put(Constants.OSGI_COMPATIBILITY_BOOTDELEGATION, "true"); //$NON-NLS-1$
+ // do nothing
}
public URLConnection mapLocationToURLConnection(String location) throws IOException {

Back to the top