patch from Stephen Fry

in case of errors, input stream is closed.
PR:
Obtained from:
Submitted by:
Reviewed by:


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

1 files changed, 7 insertions, 3 deletions

diff --git a/src/org/apache/fop/image/FopImageFactory.java b/src/org/apache/fop/image/FopImageFactory.java
index fda25c21d..995a62a60 100644
--- a/src/org/apache/fop/image/FopImageFactory.java
+++ b/src/org/apache/fop/image/FopImageFactory.java
@@ -42,6 +42,7 @@ package org.apache.fop.image;
 
 // Java
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.lang.reflect.Constructor;
@@ -110,14 +111,17 @@ public class FopImageFactory {
 
     // If not, check image type
     ImageReader imgReader = null;
+		InputStream imgIS = null;
     try {
-      imgReader =
-        ImageReaderFactory.Make(absoluteURL.openStream());
+			imgIS = absoluteURL.openStream();
+      imgReader = ImageReaderFactory.Make(imgIS);
     } catch (Exception e) {
       throw new FopImageException(
         "Error while recovering Image Informations (" +
         absoluteURL.toString() + ") : " + e.getMessage());
-    }
+    } finally {
+			try {imgIS.close();} catch (IOException e) {}
+		}
     if (imgReader == null)
       throw new FopImageException("No ImageReader for this type of image (" +
                                   absoluteURL.toString() + ")");