diff options
| author | Krzysztof Daniel | 2013-08-02 08:55:23 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2013-08-07 10:30:21 +0000 |
| commit | 4708e7a9071acf3f000247199e8d666bf11057b9 (patch) | |
| tree | c5434ed4c214643a8ae7e6c538caddc68bf77d7b | |
| parent | 987489fdd53ec00dfc69b668fc9d63e283eb8445 (diff) | |
| download | rt.equinox.p2-4708e7a9071acf3f000247199e8d666bf11057b9.tar.gz rt.equinox.p2-4708e7a9071acf3f000247199e8d666bf11057b9.tar.xz rt.equinox.p2-4708e7a9071acf3f000247199e8d666bf11057b9.zip | |
Bug 305712 - EquinoxManipulatorImpl should use Bundle#getHeaders("")
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=305712
Signed-off-by: Krzysztof Daniel <kdaniel@redhat.com>
| -rw-r--r-- | bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java index fba4751fc..6c92723db 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 IBM Corporation and others. + * Copyright (c) 2007, 2013 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 @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Red Hat, Inc - bug 305712 *******************************************************************************/ package org.eclipse.equinox.internal.frameworkadmin.equinox; @@ -284,9 +285,9 @@ public class EquinoxManipulatorImpl implements Manipulator { // System.out.println("bundles[" + i + "]=" + bundles[i]); try { if (bundles[i].getBundleId() == 0) // SystemBundle - bInfos[i] = new BundleInfo(bundles[i].getSymbolicName(), (String) bundles[i].getHeaders().get(Constants.BUNDLE_VERSION), FileLocator.getBundleFile(bundles[i]).getAbsoluteFile().toURI(), -1, true); + bInfos[i] = new BundleInfo(bundles[i].getSymbolicName(), (String) bundles[i].getHeaders("").get(Constants.BUNDLE_VERSION), FileLocator.getBundleFile(bundles[i]).getAbsoluteFile().toURI(), -1, true); //$NON-NLS-1$ else { - bInfos[i] = new BundleInfo(bundles[i].getSymbolicName(), (String) bundles[i].getHeaders().get(Constants.BUNDLE_VERSION), FileLocator.getBundleFile(bundles[i]).getAbsoluteFile().toURI(), startLevel.getBundleStartLevel(bundles[i]), startLevel.isBundlePersistentlyStarted(bundles[i])); + bInfos[i] = new BundleInfo(bundles[i].getSymbolicName(), (String) bundles[i].getHeaders("").get(Constants.BUNDLE_VERSION), FileLocator.getBundleFile(bundles[i]).getAbsoluteFile().toURI(), startLevel.getBundleStartLevel(bundles[i]), startLevel.isBundlePersistentlyStarted(bundles[i])); //$NON-NLS-1$ } } catch (IOException e) { e.printStackTrace(); |