From 3fefd0193cc8dcd50fe626a9d81719ba3c845a2f Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Thu, 14 Jul 2005 18:20:10 +0000 Subject: Connection.java (unquote): New method. 2005-07-13 Andrew Haley * gnu/java/net/protocol/file/Connection.java (unquote): New method. (connect): Unquote filename. gnu/java/net/protocol/jar/Connection.java (getInputStream): Likewise. (getJarFile): Likewise. * java/net/URLConnection.java (getContentHandler): Guard cast with instaceof. * java/net/URL.java (URL): If the file part of a spec is absolute, ignore the file part of its context. From-SVN: r102029 --- libjava/java/net/URLConnection.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'libjava/java/net/URLConnection.java') diff --git a/libjava/java/net/URLConnection.java b/libjava/java/net/URLConnection.java index 5233a56fd59..55b9d664dc7 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) -- cgit v1.2.3