1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Jai's review - Cleanup & JAR_PATH String -> Path

Browse Source
This commit is contained in:
Justin Lu 2025-06-12 09:29:14 -07:00
parent ab8785ccf0
commit afda9fe1fa
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/jdk/jdk/internal/loader/URLClassPath/ClassnameCharTest.java
View File

@ -25,10 +25,8 @@
* @bug 4957669 5017871 8358729 * @bug 4957669 5017871 8358729
* @summary cannot load class names containing some JSR 202 characters; * @summary cannot load class names containing some JSR 202 characters;
* plugin does not escape unicode character in http request * plugin does not escape unicode character in http request
* @library /test/lib
* @modules java.base/sun.net.www * @modules java.base/sun.net.www
* jdk.httpserver * jdk.httpserver
* @compile -XDignore.symbol.file=true ClassnameCharTest.java
* @run main ClassnameCharTest * @run main ClassnameCharTest
*/ */
@ -36,15 +34,14 @@ import java.io.*;
import java.lang.classfile.ClassFile; import java.lang.classfile.ClassFile;
import java.lang.constant.ClassDesc; import java.lang.constant.ClassDesc;
import java.net.*; import java.net.*;
import java.nio.file.Path;
import java.security.CodeSource; import java.security.CodeSource;
import java.util.jar.*; import java.util.jar.*;
import com.sun.net.httpserver.*; import com.sun.net.httpserver.*;
import jdk.test.lib.Utils;
import sun.net.www.ParseUtil; import sun.net.www.ParseUtil;
public class ClassnameCharTest { public class ClassnameCharTest {
private static final String JAR_PATH = Utils.TEST_CLASSES + Utils.FILE_SEPARATOR + "testclasses.jar"; private static final Path JAR_PATH = Path.of(".").resolve("testclasses.jar");
static File classesJar = new File(JAR_PATH);
static HttpServer server; static HttpServer server;
public static void realMain(String[] args) throws Exception { public static void realMain(String[] args) throws Exception {
@ -56,7 +53,7 @@ public class ClassnameCharTest {
String filename = exchange.getRequestURI().getPath(); String filename = exchange.getRequestURI().getPath();
System.out.println("getRequestURI = " + exchange.getRequestURI()); System.out.println("getRequestURI = " + exchange.getRequestURI());
System.out.println("filename = " + filename); System.out.println("filename = " + filename);
try (FileInputStream fis = new FileInputStream(classesJar); try (FileInputStream fis = new FileInputStream(JAR_PATH.toFile());
JarInputStream jis = new JarInputStream(fis)) { JarInputStream jis = new JarInputStream(fis)) {
JarEntry entry; JarEntry entry;
while ((entry = jis.getNextJarEntry()) != null) { while ((entry = jis.getNextJarEntry()) != null) {
@ -130,12 +127,15 @@ public class ClassnameCharTest {
// Make sure the codebase won't be modified // Make sure the codebase won't be modified
if (base.getProtocol().equals(finalURL.getProtocol()) && if (base.getProtocol().equals(finalURL.getProtocol()) &&
base.getHost().equals(finalURL.getHost()) && base.getHost().equals(finalURL.getHost()) &&
base.getPort() == finalURL.getPort()) { base.getPort() == finalURL.getPort() + 1) {
byte[] b = getBytes(finalURL); byte[] b = getBytes(finalURL);
return defineClass(name, b, 0, b.length, codesource); return defineClass(name, b, 0, b.length, codesource);
} }
} catch (Exception _) {} } catch (Exception e) {
throw new ClassNotFoundException(name); throw new ClassNotFoundException(name, e);
}
throw new ClassNotFoundException(
"\"%s\" not found - Protocol/Host/Port mismatch".formatted(name));
} }
/* /*
@ -216,7 +216,7 @@ public class ClassnameCharTest {
// Create the class file and write it to the testable jar // Create the class file and write it to the testable jar
static void buildJar() throws IOException { static void buildJar() throws IOException {
var bytes = ClassFile.of().build(ClassDesc.of("fo o"), _ -> {}); var bytes = ClassFile.of().build(ClassDesc.of("fo o"), _ -> {});
try (JarOutputStream jos = new JarOutputStream(new FileOutputStream(JAR_PATH))) { try (JarOutputStream jos = new JarOutputStream(new FileOutputStream(JAR_PATH.toFile()))) {
jos.putNextEntry(new JarEntry("fo o.class")); jos.putNextEntry(new JarEntry("fo o.class"));
jos.write(bytes, 0, bytes.length); jos.write(bytes, 0, bytes.length);
jos.closeEntry(); jos.closeEntry();