diff options
Diffstat (limited to 'libjava/java/net')
| -rw-r--r-- | libjava/java/net/URL.java | 12 | ||||
| -rw-r--r-- | libjava/java/net/URLConnection.java | 17 |
2 files changed, 17 insertions, 12 deletions
diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java index a136556..0ae7c1c 100644 --- a/libjava/java/net/URL.java +++ b/libjava/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. diff --git a/libjava/java/net/URLConnection.java b/libjava/java/net/URLConnection.java index 5233a56..55b9d66 100644 --- a/libjava/java/net/URLConnection.java +++ b/libjava/java/net/URLConnection.java @@ -983,17 +983,22 @@ public abstract class URLConnection if (contentType == null || contentType.equals("")) return null; - ContentHandler handler; + ContentHandler handler = null; // See if a handler has been cached for this content type. // For efficiency, if a content type has been searched for but not // found, it will be in the hash table but as the contentType String // instead of a ContentHandler. - if ((handler = (ContentHandler) handlers.get(contentType)) != null) - if (handler instanceof ContentHandler) - return handler; - else - return null; + { + Object cachedHandler; + if ((cachedHandler = handlers.get(contentType)) != null) + { + if (cachedHandler instanceof ContentHandler) + return (ContentHandler)cachedHandler; + else + return null; + } + } // If a non-default factory has been set, use it. if (factory != null) |