Commit f7879b4c authored by Eric Bruneton's avatar Eric Bruneton

Merge branch 'mbenson/asm-issue-317609'

parents f1721ac8 73997f46
Pipeline #2054 passed with stage
in 7 minutes and 15 seconds
......@@ -943,7 +943,7 @@ public class ClassWriter extends ClassVisitor {
* @return the internal name of the common super class of the two given classes.
*/
protected String getCommonSuperClass(final String type1, final String type2) {
ClassLoader classLoader = getClass().getClassLoader();
ClassLoader classLoader = getClassLoader();
Class<?> class1;
try {
class1 = Class.forName(type1.replace('/', '.'), false, classLoader);
......@@ -971,4 +971,15 @@ public class ClassWriter extends ClassVisitor {
return class1.getName().replace('.', '/');
}
}
/**
* Returns the {@link ClassLoader} to be used by the default implementation of {@link
* #getCommonSuperClass(String, String)}, that of this {@link ClassWriter}'s runtime type by
* default.
*
* @return ClassLoader
*/
protected ClassLoader getClassLoader() {
return getClass().getClassLoader();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment