Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Houghton2010-02-19 15:21:44 +0000
committerDJ Houghton2010-02-19 15:21:44 +0000
commit5fd69a563655c7ec74be5695faee349412fc2337 (patch)
tree8d0230a961e9efe1de83a2b9847ddf9329f531cb /bundles/org.eclipse.equinox.p2.extensionlocation
parente9c8deeac9a9a10fa93ad34795d601be5f394aaf (diff)
downloadrt.equinox.p2-5fd69a563655c7ec74be5695faee349412fc2337.tar.gz
rt.equinox.p2-5fd69a563655c7ec74be5695faee349412fc2337.tar.xz
rt.equinox.p2-5fd69a563655c7ec74be5695faee349412fc2337.zip
Bug 293370 - [reconciler] URI encoding problems when removing features from UM uninstall
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.extensionlocation')
-rw-r--r--bundles/org.eclipse.equinox.p2.extensionlocation/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java10
2 files changed, 10 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.extensionlocation/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.extensionlocation/META-INF/MANIFEST.MF
index c88a837bc..fed5af91f 100644
--- a/bundles/org.eclipse.equinox.p2.extensionlocation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.extensionlocation/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-SymbolicName: org.eclipse.equinox.p2.extensionlocation;singleton:=true
Bundle-Activator: org.eclipse.equinox.internal.p2.extensionlocation.Activator
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
diff --git a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java
index 888b57b1a..faffa378c 100644
--- a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java
+++ b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java
@@ -227,8 +227,16 @@ public class SiteListener extends DirectoryChangeListener {
String line = (String) e.nextElement();
StringTokenizer tokenizer = new StringTokenizer(line, ";"); //$NON-NLS-1$
String targetSite = tokenizer.nextToken();
- if (!urlString.equals(targetSite))
+ try {
+ // the urlString is coming from the site location which is an encoded URI
+ // so we need to encode the targetSite string before we check for equality
+ if (!urlString.equals(URIUtil.fromString(targetSite).toString()))
+ continue;
+ } catch (URISyntaxException e1) {
+ // shouldn't happen
+ e1.printStackTrace();
continue;
+ }
result.add(tokenizer.nextToken());
}
toBeRemoved = result.toArray(new String[result.size()]);

Back to the top