aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/net/URL.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java/net/URL.java')
-rw-r--r--libjava/java/net/URL.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java
index 4353662..96f9799 100644
--- a/libjava/java/net/URL.java
+++ b/libjava/java/net/URL.java
@@ -392,13 +392,14 @@ public final class URL implements Serializable
// right after the "://". The second colon is for an optional port value
// and implies that the host from the context is used if available.
int colon;
+ int slash = spec.indexOf('/');
if ((colon = spec.indexOf("://", 1)) > 0
+ && ((colon < slash || slash < 0))
&& ! spec.regionMatches(colon, "://:", 0, 4))
context = null;
- int slash;
if ((colon = spec.indexOf(':')) > 0
- && (colon < (slash = spec.indexOf('/')) || slash < 0))
+ && (colon < slash || slash < 0))
{
// Protocol specified in spec string.
protocol = spec.substring(0, colon).toLowerCase();
@@ -429,8 +430,6 @@ public final class URL implements Serializable
authority = context.authority;
}
else // Protocol NOT specified in spec. and no context available.
-
-
throw new MalformedURLException("Absolute URL required with null context");
protocol = protocol.trim();