compiles on jdk1.1

fixes possible npe when no proptocal specified

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194314 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/image/FopImageFactory.java b/src/org/apache/fop/image/FopImageFactory.java
index 95dee42858595e7bde652ffa801d9d3ce7282c11..25bf4551a5ac77eb420087c5d1bc21eaa75a38d6 100644 (file)
--- a/src/org/apache/fop/image/FopImageFactory.java
+++ b/src/org/apache/fop/image/FopImageFactory.java
@@ -43,13 +43,20 @@ public class FopImageFactory {
         URL absoluteURL = null;
         InputStream imgIS = null;
         try {
-            absoluteURL = new URL(href);
+            try {
+                absoluteURL = new URL(href);
+            } catch (MalformedURLException mue) {
+                // if the href contains onl a path then file is assumed
+                absoluteURL = new URL("file:" + href);
+            }
             imgIS = absoluteURL.openStream();
+        } catch (MalformedURLException e_context) {
+            throw new FopImageException("Error with image URL: " + e_context.getMessage());
         } catch (Exception e) {
             // maybe relative
             URL context_url = null;
             try {
-                absoluteURL = new URL(Configuration.getStringValue("baseDir") + absoluteURL.getPath());
+                absoluteURL = new URL(Configuration.getStringValue("baseDir") + absoluteURL.getFile());
             } catch (MalformedURLException e_context) {
                 // pb context url
                 throw new FopImageException(