Bug 475839 - NullPointerException opening Ant file with URL-based import
Change-Id: I922ea13d74cda8138fcb2ae67d2640439053a946
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntElementNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntElementNode.java
index 930ce9a..b39753b 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntElementNode.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntElementNode.java
@@ -13,6 +13,7 @@
* John-Mason P. Shackelford (john-mason.shackelford@pearson.com) - bug 49445
* Ericsson AB, Hamdan Msheik - Bug 389564
* Ericsson AB, Julian Enoch - Bug 389564
+ * David North - Bug 475839
*******************************************************************************/
package org.eclipse.ant.internal.ui.model;
@@ -241,7 +242,10 @@
try {
URL fileURL = FileLocator.toFileURL(url);
- fFilePath = new Path((URIUtil.toFile(URIUtil.toURI(fileURL))).getAbsolutePath()).toString();
+ // Bug 475839 - This is a quick fix for regression in 4.5.1, needs to be worked on in 4.6 via 476266
+ if (IAntCoreConstants.FILE.equals(fileURL.getProtocol())) {
+ fFilePath = new Path((URIUtil.toFile(URIUtil.toURI(fileURL))).getAbsolutePath()).toString();
+ }
}
catch (URISyntaxException e) {
AntUIPlugin.log(e);
