Skip to content
This repository was archived by the owner on May 19, 2025. It is now read-only.

Commit 301d39b

Browse files
fix constructor chain
1 parent 718ec92 commit 301d39b

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

patches/jdk17u_android.diff

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2534,7 +2534,7 @@ index c1caeb18c..f044f587d 100644
25342534
Class<? extends ClassLoader> callerClass =
25352535
Reflection.getCallerClass().asSubclass(ClassLoader.class);
25362536
diff --git a/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java b/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
2537-
index cd7406ac5..5290b9e55 100644
2537+
index cd7406ac5..f089fa368 100644
25382538
--- a/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
25392539
+++ b/src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
25402540
@@ -35,4 +35,5 @@ import java.net.MalformedURLException;
@@ -2550,3 +2550,17 @@ index cd7406ac5..5290b9e55 100644
25502550
+ extends URLClassLoader
25512551
{
25522552
static {
2553+
@@ -192,5 +193,5 @@ public class BuiltinClassLoader
2554+
BuiltinClassLoader(String name, BuiltinClassLoader parent, URLClassPath ucp) {
2555+
// ensure getParent() returns null when the parent is the boot loader
2556+
- super(name, parent == null || parent == ClassLoaders.bootLoader() ? null : parent);
2557+
+ super(name, new URL[]{}, parent == null || parent == ClassLoaders.bootLoader() ? null : parent);
2558+
2559+
this.parent = parent;
2560+
@@ -927,5 +928,5 @@ public class BuiltinClassLoader
2561+
* @throws SecurityException if the package name is untrusted in the manifest
2562+
*/
2563+
- private Package definePackage(String pn, Manifest man, URL url) {
2564+
+ protected Package definePackage(String pn, Manifest man, URL url) {
2565+
String specTitle = null;
2566+
String specVersion = null;

0 commit comments

Comments
 (0)