infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8345514: Should use internal class name when calling ClassLoader.getResourceAsByteArray

Browse Source 
Reviewed-by: iklam, matsaave
This commit is contained in:
Calvin Cheung 2024-12-05 15:40:12 +00:00
parent ef8da28487
commit 1ece4f9d93
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/share/cds/filemap.cpp
View File

@ -2731,8 +2731,8 @@ ClassFileStream* FileMapInfo::get_stream_from_class_loader(Handle class_loader,
const char* file_name,
TRAPS) {
JavaValue result(T_OBJECT);
TempNewSymbol class_name_sym = SymbolTable::new_symbol(file_name);
Handle ext_class_name = java_lang_String::externalize_classname(class_name_sym, CHECK_NULL);
oop class_name = java_lang_String::create_oop_from_str(file_name, THREAD);
Handle h_class_name = Handle(THREAD, class_name);
// byte[] ClassLoader.getResourceAsByteArray(String name)
JavaCalls::call_virtual(&result,
@ -2740,7 +2740,7 @@ ClassFileStream* FileMapInfo::get_stream_from_class_loader(Handle class_loader,
vmClasses::ClassLoader_klass(),
vmSymbols::getResourceAsByteArray_name(),
vmSymbols::getResourceAsByteArray_signature(),
ext_class_name,
h_class_name,
CHECK_NULL);
assert(result.get_type() == T_OBJECT, "just checking");
oop obj = result.get_oop();

29
test/hotspot/jtreg/runtime/cds/appcds/jvmti/CFLH/MultiReleaseJars.java
View File

@ -49,8 +49,8 @@ public class MultiReleaseJars {
String sts = """
public class Main {
public static void main(String[] args) throws Exception {
System.out.println(Class.forName(\"Foo\"));
System.out.println(Class.forName(\"Bar\"));
System.out.println(Class.forName("pkg1.Foo"));
System.out.println(Class.forName("pkg2.Bar"));
}
}
""";
@ -59,6 +59,7 @@ public class MultiReleaseJars {
static String getFoo() {
String sts = """
package pkg1;
class Foo {
static {
System.out.println("Hello from Foo old version");
@ -70,6 +71,7 @@ public class MultiReleaseJars {
static String getFooNewVersion() {
String sts = """
package pkg1;
class Foo {
static {
System.out.println("Hello from Foo new version");
@ -81,6 +83,7 @@ public class MultiReleaseJars {
static String getBar() {
String sts = """
package pkg2;
class Bar {
static {
System.out.println("Hello from Bar");
@ -107,13 +110,17 @@ public class MultiReleaseJars {
/* version.jar entries and files:
* META-INF/
* META-INF/MANIFEST.MF
* Bar.class
* Main.class
* pkg2/
* pkg2/Bar.class
* META-INF/versions/9/
* META-INF/versions/9/Bar.class
* META-INF/versions/9/Foo.class
* META-INF/versions/9/pkg1
* META-INF/versions/9/pkg1/Foo.class
* META-INF/versions/9/pkg2
* META-INF/versions/9/pkg2/Bar.class
* META-INF/versions/24/
* META-INF/versions/24/Foo.class
* META-INF/versions/24/pkg1
* META-INF/versions/24/pkg1Foo.class
*/
static void createClassFilesAndJar() throws Exception {
String tempDir = CDSTestUtils.getOutputDir();
@ -163,25 +170,25 @@ public class MultiReleaseJars {
String mainClass = "Main";
String appJar = TestCommon.getTestJar("multi-version.jar");
String appClasses[] = {"Foo", "Bar"};
String appClasses[] = {"pkg1/Foo", "pkg2/Bar"};
OutputAnalyzer output = TestCommon.dump(appJar, appClasses);
output.shouldContain("Loading classes to share: done.")
.shouldHaveExitValue(0);
String agentCmdArg = "-agentlib:SimpleClassFileLoadHook=Foo,Hello,HELLO";
String agentCmdArg = "-agentlib:SimpleClassFileLoadHook=pkg1/Foo,Hello,HELLO";
output = TestCommon.execAuto("-cp", appJar,
"-Xlog:cds=info,class+load",
agentCmdArg,
mainClass);
output.shouldMatch(".*Foo.source:.*multi-version.jar")
output.shouldMatch(".*pkg1.Foo.source:.*multi-version.jar")
// New version of Foo is loaded from jar since it was modified by CFLH
.shouldContain("HELLO from Foo new version") // CFLH changed "Hello" to "HELLO"
.shouldContain("class Foo") // output from Main
.shouldContain("class pkg1.Foo") // output from Main
// Bar is loaded from archive
.shouldContain("Bar source: shared objects file")
.shouldContain("Hello from Bar")
.shouldContain("class Bar"); // output from Main
.shouldContain("class pkg2.Bar"); // output from Main
}
}