Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
8 changes: 7 additions & 1 deletion src/org/python/compiler/ClassFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,13 @@ public ClassFile(String name, String superclass, int access, long mtime) {
this.access = access;
this.mtime = mtime;

cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES) {
@Override
protected ClassLoader getClassLoader() {
ClassLoader cl = ClassFile.class.getClassLoader();
return cl != null ? cl : super.getClassLoader();
}
};
methodVisitors = Collections.synchronizedList(new ArrayList<MethodVisitor>());
fieldVisitors = Collections.synchronizedList(new ArrayList<FieldVisitor>());
annotationVisitors = Collections.synchronizedList(new ArrayList<AnnotationVisitor>());
Expand Down
8 changes: 7 additions & 1 deletion src/org/python/expose/generate/ExposeTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@ private void expose(Set<File> toExpose) {
}

private void generate(Exposer exposer) {
ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES) {
@Override
protected ClassLoader getClassLoader() {
ClassLoader cl = ExposeTask.this.getClass().getClassLoader();
return cl != null ? cl : super.getClassLoader();
}
};
exposer.generate(writer);
write(exposer.getClassName(), writer.toByteArray());
}
Expand Down
8 changes: 7 additions & 1 deletion src/org/python/expose/generate/ExposedTypeProcessor.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,13 @@ public class ExposedTypeProcessor implements Opcodes, PyTypes {
*/
public ExposedTypeProcessor(InputStream in) throws IOException {
ClassReader cr = new ClassReader(in);
cw = new ClassWriter(cr, ClassWriter.COMPUTE_FRAMES);
cw = new ClassWriter(cr, ClassWriter.COMPUTE_FRAMES) {
@Override
protected ClassLoader getClassLoader() {
ClassLoader cl = ExposedTypeProcessor.this.getClass().getClassLoader();
return cl != null ? cl : super.getClassLoader();
}
};
cr.accept(new TypeProcessor(cw), 0);
}

Expand Down
8 changes: 7 additions & 1 deletion src/org/python/expose/generate/Exposer.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,13 @@ public Exposer(Class<?> superClass, String generatedName, Type...interfacesImple
* Generates this Exposer and loads it into the given Loader.
*/
protected Class<?> load(BytecodeLoader.Loader l) {
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES) {
@Override
protected ClassLoader getClassLoader() {
ClassLoader cl = Exposer.this.getClass().getClassLoader();
return cl != null ? cl : super.getClassLoader();
}
};
generate(cw);
return l.loadClassFromBytes(getClassName(), cw.toByteArray());
}
Expand Down
8 changes: 7 additions & 1 deletion src/org/python/modules/jffi/AsmClassBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,13 @@ final class AsmClassBuilder {

className = p(Invoker.class) + "$ffi$" + nextClassID.getAndIncrement();

classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES) {
@Override
protected ClassLoader getClassLoader() {
ClassLoader cl = AsmClassBuilder.class.getClassLoader();
return cl != null ? cl : super.getClassLoader();
}
};
classVisitor = DEBUG ? newCheckClassAdapter(classWriter) : classWriter;
classVisitor.visit(V1_5, ACC_PUBLIC | ACC_FINAL, className, null,
p(parentClass), new String[0]);
Expand Down
Loading