diff options
| author | John Arthorne | 2008-08-12 17:13:32 +0000 |
|---|---|---|
| committer | John Arthorne | 2008-08-12 17:13:32 +0000 |
| commit | 68f24a3073deff6bd60e829ea7c5804adffa4912 (patch) | |
| tree | 4b3ea399b03b51d373a986e55dc8d3a8a5ab284c | |
| parent | 90da52fcd51a022e49181e4938a9e20f31b1a780 (diff) | |
| download | rt.equinox.p2-68f24a3073deff6bd60e829ea7c5804adffa4912.tar.gz rt.equinox.p2-68f24a3073deff6bd60e829ea7c5804adffa4912.tar.xz rt.equinox.p2-68f24a3073deff6bd60e829ea7c5804adffa4912.zip | |
Bug 243422 Feature with empty required version incorrectly converted to [0.0.0,1.0.0)
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java index ad09c7538..5dfcfff56 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java +++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java @@ -1093,15 +1093,13 @@ public class MetadataGeneratorHelper { public static VersionRange getVersionRange(FeatureEntry entry) { String versionSpec = entry.getVersion(); - if (versionSpec == null || versionSpec.length() == 0) - // TODO should really be returning VersionRange.emptyRange here... - return null; + if (versionSpec == null) + return VersionRange.emptyRange; Version version = new Version(versionSpec); - if (!entry.isRequires()) { - if ("0.0.0".equals(entry.getVersion())) //$NON-NLS-1$ - return VersionRange.emptyRange; + if (version.equals(Version.emptyVersion)) + return VersionRange.emptyRange; + if (!entry.isRequires()) return new VersionRange(version, true, version, true); - } String match = entry.getMatch(); if (match == null || match.equals("compatible")) { //$NON-NLS-1$ Version upper = new Version(version.getMajor() + 1, 0, 0); |