stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8338686: App classpath mismatch if a jar from the Class-Path attribute is on the classpath

Browse Source 
Reviewed-by: dholmes, iklam
This commit is contained in:
Calvin Cheung 2024-09-17 18:58:46 +00:00
parent 5dc9723c81
commit d5881825ef
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/share/classfile/classLoader.cpp
View File

@ -834,7 +834,8 @@ bool ClassLoader::add_to_app_classpath_entries(JavaThread* current,
ClassPathEntry* e = _app_classpath_entries;
if (check_for_duplicates) {
while (e != nullptr) {
if (strcmp(e->name(), entry->name()) == 0) {
if (strcmp(e->name(), entry->name()) == 0 &&
e->from_class_path_attr() == entry->from_class_path_attr()) {
// entry already exists
return false;
}

58
test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java
View File

@ -27,6 +27,7 @@
* @summary Class-Path: attribute in MANIFEST file
* @requires vm.cds
* @library /test/lib
* @compile test-classes/Hello.java
* @run driver/timeout=240 ClassPathAttr
*/
@ -45,6 +46,7 @@ public class ClassPathAttr {
public static void main(String[] args) throws Exception {
testNormalOps();
testNonExistentJars();
testClassPathAttrJarOnCP();
}
static void testNormalOps() throws Exception {
@ -197,6 +199,62 @@ public class ClassPathAttr {
});
}
static void testClassPathAttrJarOnCP() throws Exception {
String helloJar = JarBuilder.getOrCreateHelloJar();
String jar1 = TestCommon.getTestJar("cpattr1.jar");
String cp = jar1 + File.pathSeparator + helloJar;
// The cpattr1.jar contains "Class-Path: cpattr2.jar".
// The cpattr2.jar contains "Class-Path: cpattr3.jar cpattr5_123456789_223456789_323456789_42345678.jar".
// With -cp cpattr1:hello.jar, the following shared paths should be stored in the CDS archive:
// cpattr1.jar:cpattr2.jar:cpattr3.jar:cpattr5_123456789_223456789_323456789_42345678.jari:hello.jar
TestCommon.testDump(cp, TestCommon.list("Hello"), "-Xlog:class+path");
// Run with the same -cp apattr1.jar:hello.jar. The Hello class should be
// loaded from the archive.
TestCommon.run("-Xlog:class+path,class+load",
"-cp", cp,
"Hello")
.assertNormalExit(output -> {
output.shouldContain("Hello source: shared objects file");
});
// Run with -cp apattr1.jar:cpattr2.jar:hello.jar. App classpath mismatch should be detected.
String jar2 = TestCommon.getTestJar("cpattr2.jar");
cp = jar1 + File.pathSeparator + jar2 + File.pathSeparator + helloJar;
TestCommon.run("-Xlog:class+path,class+load",
"-cp", cp,
"Hello")
.assertAbnormalExit(output -> {
output.shouldMatch(".*APP classpath mismatch, actual: -Djava.class.path=.*cpattr1.jar.*cpattr2.jar.*hello.jar")
.shouldContain("Unable to use shared archive.");
});
// Run with different -cp cpattr2.jar:hello.jar. App classpath mismatch should be detected.
cp = jar2 + File.pathSeparator + helloJar;
TestCommon.run("-Xlog:class+path,class+load",
"-cp", cp,
"Hello")
.assertAbnormalExit(output -> {
output.shouldMatch(".*APP classpath mismatch, actual: -Djava.class.path=.*cpattr2.jar.*hello.jar")
.shouldContain("Unable to use shared archive.");
});
// Dumping with -cp cpattr1.jar:cpattr2.jar:hello.jar
// The cpattr2.jar is from the Class-Path: attribute of cpattr1.jar.
cp = jar1 + File.pathSeparator + jar2 + File.pathSeparator + helloJar;
TestCommon.testDump(cp, TestCommon.list("Hello"), "-Xlog:class+path");
// Run with the same -cp as dump time. The Hello class should be loaded from the archive.
TestCommon.run("-Xlog:class+path,class+load",
"-cp", cp,
"Hello")
.assertNormalExit(output -> {
output.shouldContain("Hello source: shared objects file");
});
}
private static void buildCpAttr(String jarName, String manifest, String enclosingClassName, String ...testClassNames) throws Exception {
String jarClassesDir = CDSTestUtils.getOutputDir() + File.separator + jarName + "_classes";
try { Files.createDirectory(Paths.get(jarClassesDir)); } catch (FileAlreadyExistsException e) { }