diff options
| author | Simon Kaegi | 2008-11-27 02:49:24 +0000 |
|---|---|---|
| committer | Simon Kaegi | 2008-11-27 02:49:24 +0000 |
| commit | 615daf500ebf22baa4fa86981ddfe3151930b06f (patch) | |
| tree | adef84a54afa2ecd37aa950f91180d83e6a74b31 /bundles/org.eclipse.equinox.simpleconfigurator.manipulator | |
| parent | 9572208085ccfed21e1f644aa1458ef3a865a2c3 (diff) | |
| download | rt.equinox.p2-615daf500ebf22baa4fa86981ddfe3151930b06f.tar.gz rt.equinox.p2-615daf500ebf22baa4fa86981ddfe3151930b06f.tar.xz rt.equinox.p2-615daf500ebf22baa4fa86981ddfe3151930b06f.zip | |
Bug 256708 Accept null base in SimpleConfiguratorManipulator#saveConfiguration
Diffstat (limited to 'bundles/org.eclipse.equinox.simpleconfigurator.manipulator')
| -rw-r--r-- | bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java index 3d110d9f4..71642c9b1 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java @@ -326,7 +326,7 @@ public class SimpleConfiguratorManipulatorImpl implements SimpleConfiguratorMani org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[] simpleInfos = new org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[configuration.length]; for (int i = 0; i < configuration.length; i++) { BundleInfo bundleInfo = (BundleInfo) configuration[i]; - URI location = URIUtil.makeRelative(bundleInfo.getLocation(), base != null ? base.toURI() : null); + URI location = base != null ? URIUtil.makeRelative(bundleInfo.getLocation(), base.toURI()) : bundleInfo.getLocation(); simpleInfos[i] = new org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo(bundleInfo.getSymbolicName(), bundleInfo.getVersion(), location, bundleInfo.getStartLevel(), bundleInfo.isMarkedAsStarted()); } SimpleConfiguratorManipulatorUtils.writeConfiguration(simpleInfos, outputFile); |