summaryrefslogtreecommitdiff
path: root/java/net/URL.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/net/URL.java')
-rw-r--r--java/net/URL.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/java/net/URL.java b/java/net/URL.java
index 627dbc391..1d947a0b4 100644
--- a/java/net/URL.java
+++ b/java/net/URL.java
@@ -408,10 +408,7 @@ public final class URL implements Serializable
// The 1.2 doc specifically says these are copied to the new URL.
host = context.host;
port = context.port;
- file = context.file;
userInfo = context.userInfo;
- if (file == null || file.length() == 0)
- file = "/";
authority = context.authority;
}
}
@@ -423,10 +420,13 @@ public final class URL implements Serializable
protocol = context.protocol;
host = context.host;
port = context.port;
- file = context.file;
userInfo = context.userInfo;
- if (file == null || file.length() == 0)
- file = "/";
+ if (spec.indexOf(":/", 1) < 0)
+ {
+ file = context.file;
+ if (file == null || file.length() == 0)
+ file = "/";
+ }
authority = context.authority;
}
else // Protocol NOT specified in spec. and no context available.