# HG changeset patch # User jlahoda # Date 1431682864 -7200 # Node ID 4ed55656acd7762cd7c4a8a9840a80b5b58643b2 # Parent 1bbdff43424d5f0c19f28edff889a5689dbca8d4 8076104: Key collisions in ZipFileIndexFileObject content cache lead to wrong content Summary: equals&hashCode of ZipFileObject and ZipFileIndexFileObject need to be based on full entry path, not only the file name. Reviewed-by: jjg diff -r 1bbdff43424d -r 4ed55656acd7 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipArchive.java --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipArchive.java Fri May 15 01:56:14 2015 -0700 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipArchive.java Fri May 15 11:41:04 2015 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -278,12 +278,12 @@ ZipFileObject o = (ZipFileObject) other; return zarch.getAbsoluteFile().equals(o.zarch.getAbsoluteFile()) - && name.equals(o.name); + && entry.getName().equals(o.entry.getName()); } @Override public int hashCode() { - return zarch.getAbsoluteFile().hashCode() + name.hashCode(); + return zarch.getAbsoluteFile().hashCode() + entry.getName().hashCode(); } } diff -r 1bbdff43424d -r 4ed55656acd7 langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java Fri May 15 01:56:14 2015 -0700 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java Fri May 15 11:41:04 2015 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -228,12 +228,12 @@ ZipFileIndexFileObject o = (ZipFileIndexFileObject) other; return zfIndex.getAbsoluteFile().equals(o.zfIndex.getAbsoluteFile()) - && name.equals(o.name); + && entry.equals(o.entry); } @Override public int hashCode() { - return zfIndex.getAbsoluteFile().hashCode() + name.hashCode(); + return zfIndex.getAbsoluteFile().hashCode() + entry.hashCode(); } private String getPrefixedEntryName() { diff -r 1bbdff43424d -r 4ed55656acd7 langtools/test/tools/javac/file/zip/T8076104.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/file/zip/T8076104.java Fri May 15 11:41:04 2015 +0200 @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8076104 + * @summary Verify that ZipFileIndexFileObject and ZipFileObject's getCharContent method + * do not return cached content for another file. + * @run main T8076104 + */ +import com.sun.tools.javac.Main; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.jar.JarEntry; +import java.util.jar.JarOutputStream; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.TypeElement; +import javax.tools.FileObject; +import javax.tools.JavaCompiler; +import javax.tools.StandardLocation; +import javax.tools.ToolProvider; + +@SupportedAnnotationTypes("*") +public class T8076104 extends AbstractProcessor { + + public static void main(String [] args) throws Exception { + new T8076104().run(); + } + + void run() throws Exception { + File testJar = createJar(); + doTest(testJar); + doTest(testJar, "-XDuseOptimizedZip=false"); + } + + File createJar() throws Exception { + File testJar = new File(System.getProperty("test.classes"), "T8076104-test.jar"); + testJar.delete(); + try (OutputStream fileOut = new FileOutputStream(testJar); + JarOutputStream jarOut = new JarOutputStream(new BufferedOutputStream(fileOut))) { + jarOut.putNextEntry(new JarEntry("d1/A.java")); + jarOut.write("1".getBytes()); + jarOut.putNextEntry(new JarEntry("d2/A.java")); + jarOut.write("2".getBytes()); + } + + return testJar; + } + + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + + void doTest(File testJar, String... additionalArgs) { + List options = new ArrayList<>(); + options.add("-proc:only"); + options.add("-processor"); + options.add("T8076104"); + options.add("-classpath"); + options.add(System.getProperty("test.classes") + File.pathSeparator + testJar.getAbsolutePath()); + options.addAll(Arrays.asList(additionalArgs)); + options.add(System.getProperty("test.src") + File.separator + "T8076104.java"); + + int res = Main.compile(options.toArray(new String[0])); + + if (res != 0) { + throw new AssertionError("Unexpected error code: " + res); + } + } + + @Override + public boolean process(Set annotations, RoundEnvironment roundEnv) { + assertFileContent("d1/A.java", "1"); + assertFileContent("d2/A.java", "2"); + return false; + } + + void assertFileContent(String relPath, + String expectedContent) { + try { + FileObject fo = processingEnv.getFiler() + .getResource(StandardLocation.CLASS_PATH, "", relPath); + String actualContent = fo.getCharContent(false).toString(); + + if (!expectedContent.equals(actualContent)) { + throw new AssertionError("Actual content not matching the expected content: " + + actualContent); + } + } catch (IOException ex) { + throw new AssertionError("Unexpected exception: ", ex); + } + } + + @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latest(); + } +}