2006-11-04 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD-->generics-branch for 2006/10/29 to 2006/11/04.

1 files changed, 14 insertions, 11 deletions

diff --git a/javax/swing/text/html/ImageView.java b/javax/swing/text/html/ImageView.java
index 84b021070..ff0d3ea40 100644
--- a/javax/swing/text/html/ImageView.java
+++ b/javax/swing/text/html/ImageView.java
@@ -175,19 +175,22 @@ public class ImageView extends View
    */
   public URL getImageURL()
   {
-    Object url = getAttributes().getAttribute(Attribute.SRC);
-    if (url == null)
-      return null;
-
-    try
-      {
-        return new URL(url.toString());
-      }
-    catch (MalformedURLException e)
+    Element el = getElement();
+    String src = (String) el.getAttributes().getAttribute(Attribute.SRC);
+    URL url = null;
+    if (src != null)
       {
-        // The URL is malformed - no image.
-        return null;
+        URL base = ((HTMLDocument) getDocument()).getBase();
+        try
+          {
+            url = new URL(base, src);
+          }
+        catch (MalformedURLException ex)
+          {
+            // Return null.
+          }
       }
+    return url;
   }
 
   /**