Skip to content

Commit 08549ff

Browse files
committed
Revert "Fix a possible linkage error"
This reverts commit b00e4bc.
1 parent c1ed63e commit 08549ff

1 file changed

Lines changed: 4 additions & 15 deletions

File tree

src/main/java/org/hyperskill/hstest/dynamic/DynamicClassLoader.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,11 @@ public DynamicClassLoader(Class<?> clazz) {
2525

2626
protected synchronized Class<?> loadClass(String name, boolean resolve)
2727
throws ClassNotFoundException {
28-
29-
Class<?> c = findLoadedClass(name);
30-
if (c == null) {
31-
try {
32-
if (getParent() != null) {
33-
c = getParent().loadClass(name);
34-
}
35-
} catch (ClassNotFoundException e) {
36-
c = findClass(name);
37-
}
38-
}
39-
28+
Class<?> result = findClass(name);
4029
if (resolve) {
41-
resolveClass(c);
30+
resolveClass(result);
4231
}
43-
return c;
32+
return result;
4433
}
4534

4635
protected Class<?> findClass(String name) throws ClassNotFoundException {
@@ -56,7 +45,7 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
5645
if (classBytes == null) {
5746
File f = findFile(name);
5847
if (f == null) {
59-
throw new ClassNotFoundException(name);
48+
return findSystemClass(name);
6049
}
6150

6251
classBytes = loadFileAsBytes(f);

0 commit comments

Comments
 (0)