Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2008-02-28 20:42:52 +0000
committerJohn Arthorne2008-02-28 20:42:52 +0000
commit690331ab9c5478b26af586c6527d37e9f071926d (patch)
treec2e0540874437a8d3b8a61264f84619d4ac1915a
parent70e93b59caa3589e37689fce92d2fa8e1c14933c (diff)
downloadrt.equinox.p2-690331ab9c5478b26af586c6527d37e9f071926d.tar.gz
rt.equinox.p2-690331ab9c5478b26af586c6527d37e9f071926d.tar.xz
rt.equinox.p2-690331ab9c5478b26af586c6527d37e9f071926d.zip
Bug 220597 NPE using the installer
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java7
1 files changed, 0 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java
index 9fd7c9015..b0ba9efe6 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallUpdateProductOperation.java
@@ -37,12 +37,6 @@ import org.osgi.framework.*;
*/
public class InstallUpdateProductOperation implements IInstallOperation {
- /**
- * This constant comes from value of FrameworkAdmin.SERVICE_PROP_KEY_LAUNCHER_NAME.
- * This profile property is being used as a short term solution for branding of the launcher.
- */
- private static final String PROP_LAUNCHER_NAME = "org.eclipse.equinox.frameworkhandler.launcher.name"; //$NON-NLS-1$
-
private IArtifactRepositoryManager artifactRepoMan;
private BundleContext bundleContext;
private IDirector director;
@@ -81,7 +75,6 @@ public class InstallUpdateProductOperation implements IInstallOperation {
if (profile == null) {
Map properties = new HashMap();
properties.put(IProfile.PROP_INSTALL_FOLDER, installDescription.getInstallLocation().toString());
- properties.put(PROP_LAUNCHER_NAME, installDescription.getLauncherName());
EnvironmentInfo info = (EnvironmentInfo) ServiceHelper.getService(InstallerActivator.getDefault().getContext(), EnvironmentInfo.class.getName());
String env = "osgi.os=" + info.getOS() + ",osgi.ws=" + info.getWS() + ",osgi.arch=" + info.getOSArch(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
properties.put(IProfile.PROP_ENVIRONMENTS, env);

Back to the top