summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis Windatt2013-04-24 16:40:06 (EDT)
committerCurtis Windatt2013-04-24 16:40:37 (EDT)
commit1b5b30b2ee5be22cd482113c046247ae6e1291bd (patch)
treea83f3f093ed03448d73a55c02196ea4f076b9931
parent7709e545b89860928388d520a3e16ab902da694e (diff)
downloadeclipse.pde.ui-1b5b30b2ee5be22cd482113c046247ae6e1291bd.zip
eclipse.pde.ui-1b5b30b2ee5be22cd482113c046247ae6e1291bd.tar.gz
eclipse.pde.ui-1b5b30b2ee5be22cd482113c046247ae6e1291bd.tar.bz2
Bug 406018 - [plugin] NPE from plug-in extensions editor
-rw-r--r--ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEManager.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEManager.java
index c0bc69b..0e4b404 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEManager.java
@@ -84,10 +84,12 @@ public class PDEManager {
private static void addNLLocation(IPluginModelBase model, ArrayList<URL> urls) {
// We should use model.getNLLookupLocation(), but it doesn't return an encoded url (Bug 403512)
- try {
- URI encodedURI = URIUtil.toURI(model.getInstallLocation(), true);
- urls.add(encodedURI.toURL());
- } catch (MalformedURLException e) {
+ if (model.getInstallLocation() != null) {
+ try {
+ URI encodedURI = URIUtil.toURI(model.getInstallLocation(), true);
+ urls.add(encodedURI.toURL());
+ } catch (MalformedURLException e) {
+ }
}
}