Replace with getSystemResourceAsStream

biboudis · Jun 21, 2024 · ebf223a · ebf223a
1 parent 5d18264
commit ebf223a
Showing 1 changed file with 16 additions and 20 deletions.
diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
@@ -2306,27 +2306,23 @@ public Constructor<?>[] getConstructors() throws SecurityException {
     }
 
     private Method[] filterOutDeconstructorsFromMethods(Method[] in) {
-        if (this.getClassLoader() != null) {
-            Set<String> isPattern = new HashSet<>();
-            ClassModel cm = null;
-            try (InputStream resource = this.getClassLoader().getResourceAsStream(getName() + ".class")) {
-                if (resource == null) {
-                    return in;
-                }
-                byte[] bytes = resource.readAllBytes();
-                cm = ClassFile.of().parse(bytes);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-            for (MethodModel mm : cm.methods()) {
-                PatternAttribute pa = mm.findAttribute(Attributes.pattern()).orElse(null);
-                if (pa != null) isPattern.add(mm.methodName().stringValue());
+        Set<String> isPattern = new HashSet<>();
+        ClassModel cm = null;
+        try (InputStream resource = ClassLoader.getSystemResourceAsStream(getName() + ".class")) {
+            if (resource == null) {
+                return in;
             }
-            Method[] ret = Arrays.stream(in).filter(m -> !isPattern.contains(m.getName())).toArray(Method[]::new);
-            return ret;
-        } else {
-            return in;
+            byte[] bytes = resource.readAllBytes();
+            cm = ClassFile.of().parse(bytes);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        for (MethodModel mm : cm.methods()) {
+            PatternAttribute pa = mm.findAttribute(Attributes.pattern()).orElse(null);
+            if (pa != null) isPattern.add(mm.methodName().stringValue());
         }
+        Method[] ret = Arrays.stream(in).filter(m -> !isPattern.contains(m.getName())).toArray(Method[]::new);
+        return ret;
     }
 
     /**
@@ -2417,7 +2413,7 @@ public Deconstructor<?>[] getDeclaredDeconstructors() throws SecurityException {
 
     private Deconstructor<?>[] getDeclaredDeconstructors0(Class<?>[] params, int which) {
         ArrayList<Deconstructor<?>> decs = new ArrayList<>();
-        try(InputStream is = this.getClassLoader().getResourceAsStream(getName() + ".class")) {
+        try(InputStream is = ClassLoader.getSystemResourceAsStream(getName() + ".class")) {
             byte[] bytes = is.readAllBytes();
             ClassModel cm = ClassFile.of().parse(bytes);
             for (MethodModel mm : cm.methods()) {