Bommels05/commons-xml
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug with file: URLs getting too many slashes (file:////) which caused confusion

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/xml/commons/trunk@225978 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ndw 2002-06-14 14:37:20 +00:00
parent 8c459bfa25
commit 3d9241dce9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/org/apache/xml/resolver/Catalog.java
View File

@ -749,7 +749,7 @@ public class Catalog {
try { try {
// tack on a basename because URLs point to files not dirs // tack on a basename because URLs point to files not dirs
String userdir = fixSlashes(System.getProperty("user.dir")); String userdir = fixSlashes(System.getProperty("user.dir"));
catalogCwd = new URL("file:///" + userdir + "/basename"); catalogCwd = new URL("file:" + userdir + "/basename");
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
String userdir = fixSlashes(System.getProperty("user.dir")); String userdir = fixSlashes(System.getProperty("user.dir"));
Debug.message(1, "Malformed URL on cwd", userdir); Debug.message(1, "Malformed URL on cwd", userdir);
@ -761,7 +761,7 @@ public class Catalog {
base = new URL(catalogCwd, fixSlashes(fileName)); base = new URL(catalogCwd, fixSlashes(fileName));
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
try { try {
base = new URL("file:///" + fixSlashes(fileName)); base = new URL("file:" + fixSlashes(fileName));
} catch (MalformedURLException e2) { } catch (MalformedURLException e2) {
Debug.message(1, "Malformed URL on catalog filename", Debug.message(1, "Malformed URL on catalog filename",
fixSlashes(fileName)); fixSlashes(fileName));
@ -843,7 +843,7 @@ public class Catalog {
newbase = new URL(base, value); newbase = new URL(base, value);
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
try { try {
newbase = new URL("file:///" + value); newbase = new URL("file:" + value);
} catch (MalformedURLException e2) { } catch (MalformedURLException e2) {
Debug.message(1, "Malformed URL on base", value); Debug.message(1, "Malformed URL on base", value);
newbase = null; newbase = null;