Skip to content

Fix hierarchy computation of boot layer classes #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marchermans merged 3 commits into from
May 23, 2022
Merged

Fix hierarchy computation of boot layer classes #28

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d82a2f8
Use system classloader as fallback for transformable class bytes
Su5eD Mar 26, 2022
00e5edf
Handle missing transformable class bytes
Su5eD Mar 29, 2022
4f38bf7
Move empty bytes check behind transformation
Su5eD Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/main/java/cpw/mods/cl/ModuleClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,22 +230,30 @@ protected <T> T loadFromModule(final String moduleName, BiFunction<ModuleReader,
}
}

protected byte[] getMaybeTransformedClassBytes(final String name, final String context) {
protected byte[] getMaybeTransformedClassBytes(final String name, final String context) throws ClassNotFoundException {
byte[] bytes = new byte[0];
Throwable suppressed = null;
try {
final var pname = name.substring(0, name.lastIndexOf('.'));
if (this.packageLookup.containsKey(pname)) {
bytes = loadFromModule(classNameToModuleName(name), (reader, ref)->this.getClassBytes(reader, ref, name));
} else {
} else if (this.parentLoaders.containsKey(pname)) {
var cname = name.replace('.','/')+".class";
try (var is = this.parentLoaders.getOrDefault(pname, ClassLoader.getPlatformClassLoader()).getResourceAsStream(cname)) {
try (var is = this.parentLoaders.get(pname).getResourceAsStream(cname)) {
if (is != null)
bytes = is.readAllBytes();
}
}
} catch (IOException ignored) {
} catch (IOException e) {
suppressed = e;
}
byte[] maybeTransformedBytes = maybeTransformClassBytes(bytes, name, context);
if (maybeTransformedBytes.length == 0) {
ClassNotFoundException e = new ClassNotFoundException(name);
if (suppressed != null) e.addSuppressed(suppressed);
throw e;
}
return maybeTransformClassBytes(bytes, name, context);
return maybeTransformedBytes;
}

public void setFallbackClassLoader(final ClassLoader fallbackClassLoader) {
Expand Down