azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GeneratedClassLoader so that it loads Package instances

Browse Source
This commit is contained in:
Alexander Udalov
2014-07-01 20:12:12 +04:00
parent a38a396a43
commit f459005fe7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/GeneratedClassLoader.java
+8
View File
@@ -22,6 +22,7 @@ import org.jetbrains.jet.OutputFile;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.List; import java.util.List;
import java.util.jar.Manifest;
public class GeneratedClassLoader extends URLClassLoader { public class GeneratedClassLoader extends URLClassLoader {
private ClassFileFactory state; private ClassFileFactory state;
@@ -39,6 +40,13 @@ public class GeneratedClassLoader extends URLClassLoader {
OutputFile outputFile = state.get(classFilePath); OutputFile outputFile = state.get(classFilePath);
if (outputFile != null) { if (outputFile != null) {
byte[] bytes = outputFile.asByteArray(); byte[] bytes = outputFile.asByteArray();
int lastDot = name.lastIndexOf('.');
if (lastDot >= 0) {
String pkgName = name.substring(0, lastDot);
if (getPackage(pkgName) == null) {
definePackage(pkgName, new Manifest(), null);
}
}
return defineClass(name, bytes, 0, bytes.length); return defineClass(name, bytes, 0, bytes.length);
} }