8012156: tools/javac/file/zip/T6865530.java fails for win32/64 in 7u25 nightly runs

Reviewed-by: alanb
This commit is contained in:
Chris Hegarty 2013-06-14 16:38:13 +01:00
parent 0431243910
commit 8322464f71

View File

@ -722,8 +722,16 @@ public class URLClassPath {
/* 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;
}