8012156: tools/javac/file/zip/T6865530.java fails for win32/64 in 7u25 nightly runs
Reviewed-by: alanb
--- a/jdk/src/share/classes/sun/misc/URLClassPath.java Wed May 22 13:57:59 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/URLClassPath.java Fri Jun 14 16:38:13 2013 +0100
@@ -722,8 +722,16 @@
/* Throws if the given jar file is does not start with the correct LOC */
static JarFile checkJar(JarFile jar) throws IOException {
if (System.getSecurityManager() != null && !DISABLE_JAR_CHECKING
- && !zipAccess.startsWithLocHeader(jar))
- throw new IOException("Invalid Jar file");
+ && !zipAccess.startsWithLocHeader(jar)) {
+ IOException x = new IOException("Invalid Jar file");
+ try {
+ jar.close();
+ } catch (IOException ex) {
+ x.addSuppressed(ex);
+ }
+ throw x;
+ }
+
return jar;
}