Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2010-04-22 16:29:58 -0400
committerAndrew Niefer2010-04-22 16:29:58 -0400
commitb6bb5140b0d0501afe0fbead46689a58a71e08c4 (patch)
tree3397d8c72d480382db96fc033c7557dc6498354b /bundles/org.eclipse.equinox.p2.touchpoint.eclipse
parent195b4b0aaa025ad5c1406a7daa06e82e623a75be (diff)
downloadrt.equinox.p2-b6bb5140b0d0501afe0fbead46689a58a71e08c4.tar.gz
rt.equinox.p2-b6bb5140b0d0501afe0fbead46689a58a71e08c4.tar.xz
rt.equinox.p2-b6bb5140b0d0501afe0fbead46689a58a71e08c4.zip
bug 309923 - NPE while updating IBuild
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.touchpoint.eclipse')
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java
index 14e9f5085..ae3e2c3c4 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java
@@ -132,7 +132,7 @@ public class ConfigurationParser implements ConfigurationConstants {
try {
// do this to ensure the location is an encoded URI
URI uri = URIUtil.fromString(url);
- URI osgiURI = URIUtil.toURI(osgiInstallArea);
+ URI osgiURI = osgiInstallArea != null ? URIUtil.toURI(osgiInstallArea) : null;
result.setUrl(getLocation(uri, osgiURI).toString());
} catch (URISyntaxException e) {
result.setUrl(url);

Back to the top