--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java Thu Mar 17 14:42:40 2011 -0700
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java Thu Mar 17 18:50:06 2011 -0700
@@ -268,18 +268,18 @@
// 4947205 : Peformance is slow when using pack-effort=0
out = new BufferedOutputStream(out);
out = new NonCloser(out); // protect from JarOutputStream.close()
- JarOutputStream jout = new JarOutputStream(out);
- copyJarFile(in, jout);
- jout.close();
+ try (JarOutputStream jout = new JarOutputStream(out)) {
+ copyJarFile(in, jout);
+ }
}
static void copyJarFile(JarFile in, OutputStream out) throws IOException {
// 4947205 : Peformance is slow when using pack-effort=0
out = new BufferedOutputStream(out);
out = new NonCloser(out); // protect from JarOutputStream.close()
- JarOutputStream jout = new JarOutputStream(out);
- copyJarFile(in, jout);
- jout.close();
+ try (JarOutputStream jout = new JarOutputStream(out)) {
+ copyJarFile(in, jout);
+ }
}
// Wrapper to prevent closing of client-supplied stream.
static private