/hg/icedtea-web: Move stream closing utility in JNLPClassLoader ...

[adomurad at icedtea.classpath.org]

changeset e19fe33c82df in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e19fe33c82df
author: Adam Domurad <adomurad at redhat.com>
date: Tue Mar 05 16:35:40 2013 -0500

	Move stream closing utility in JNLPClassLoader to StreamUtils


diffstat:

 ChangeLog                                              |   8 ++++++
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  23 +++--------------
 netx/net/sourceforge/jnlp/util/StreamUtils.java        |  18 +++++++++++++-
 3 files changed, 30 insertions(+), 19 deletions(-)

diffs (94 lines):

diff -r 555397961654 -r e19fe33c82df ChangeLog
--- a/ChangeLog	Thu Feb 28 16:03:39 2013 +0100
+++ b/ChangeLog	Tue Mar 05 16:35:40 2013 -0500
@@ -1,3 +1,11 @@
+2013-03-05  Adam Domurad  <adomurad at redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+	(closeStream): Remove.
+	(verifySignedJNLP): Make use of StreamUtils instead.
+	* netx/net/sourceforge/jnlp/utils/StreamUtils.java
+	(closeSilently): New method.
+
 2013-02-28  Jiri Vanek  <jvanek at redhat.com>
 
 	* netx/net/sourceforge/jnlp/config/SecurityValueValidator.java: modifed
diff -r 555397961654 -r e19fe33c82df netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Thu Feb 28 16:03:39 2013 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Mar 05 16:35:40 2013 -0500
@@ -89,6 +89,7 @@
 import net.sourceforge.jnlp.security.SecurityDialogs;
 import net.sourceforge.jnlp.tools.JarCertVerifier;
 import net.sourceforge.jnlp.util.FileUtils;
+import net.sourceforge.jnlp.util.StreamUtils;
 import sun.misc.JarIndex;
 
 /**
@@ -1022,30 +1023,16 @@
         } finally {
 
             //Close all streams
-            closeStream(inStream);
-            closeStream(inputReader);
-            closeStream(fr);
-            closeStream(jnlpReader);
+            StreamUtils.closeSilently(inStream);
+            StreamUtils.closeSilently(inputReader);
+            StreamUtils.closeSilently(fr);
+            StreamUtils.closeSilently(jnlpReader);
         }
 
         if (JNLPRuntime.isDebug())
             System.err.println("Ending check for signed JNLP file...");
     }
 
-    /***
-     * Closes a stream
-     * 
-     * @param stream the stream that will be closed
-     */
-    private void closeStream (Closeable stream) {
-        if (stream != null)
-            try {
-                stream.close();
-            } catch (Exception e) {
-                e.printStackTrace(System.err);
-            }
-    }
-
     /**
      * Prompt the user for trust on all the signers that require approval.
      * @throws LaunchException if the user does not approve every dialog prompt.
diff -r 555397961654 -r e19fe33c82df netx/net/sourceforge/jnlp/util/StreamUtils.java
--- a/netx/net/sourceforge/jnlp/util/StreamUtils.java	Thu Feb 28 16:03:39 2013 +0100
+++ b/netx/net/sourceforge/jnlp/util/StreamUtils.java	Tue Mar 05 16:35:40 2013 -0500
@@ -37,6 +37,7 @@
 
 package net.sourceforge.jnlp.util;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -55,4 +56,19 @@
         in.close();
     }
 
-}
\ No newline at end of file
+    /***
+     * Closes a stream, without throwing IOException.
+     * In case of IOException, prints the stack trace to System.err.
+     * 
+     * @param stream the stream that will be closed
+     */
+    public static void closeSilently (Closeable stream) {
+        if (stream != null) {
+            try {
+                stream.close();
+            } catch (IOException e) {
+                e.printStackTrace(System.err);
+            }
+        }
+    }
+}