Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed class loading for compiled Java plugins. -Bibl

Browse source
This commit is contained in:
TheBiblMan 2015-06-01 15:29:56 +01:00
parent ff7bd343fc
commit 6db4dc2500
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/the/bytecode/club/bytecodeviewer/plugin/strategies/CompiledJavaPluginLaunchStrategy.java
View file

@ -136,10 +136,8 @@ public class CompiledJavaPluginLaunchStrategy implements PluginLaunchStrategy {
ccache = new HashMap<String, Class<?>>(); ccache = new HashMap<String, Class<?>>();
for(LoadedNodeData d: set) { for(LoadedNodeData d: set) {
if(d != data) {
cache.put(d.node.name, d); cache.put(d.node.name, d);
} }
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Class<? extends Plugin> pluginKlass = (Class<? extends Plugin>) loadClass(data.node.name.replace("/", ".")); Class<? extends Plugin> pluginKlass = (Class<? extends Plugin>) loadClass(data.node.name.replace("/", "."));
@ -152,7 +150,9 @@ public class CompiledJavaPluginLaunchStrategy implements PluginLaunchStrategy {
@Override @Override
public Class<?> findClass(String name) throws ClassNotFoundException { public Class<?> findClass(String name) throws ClassNotFoundException {
name = name.replace("/", "."); name = name.replace(".", "/");
System.out.println("finding " + name);
if(ccache.containsKey(name)) if(ccache.containsKey(name))
return ccache.get(name); return ccache.get(name);
@ -160,7 +160,7 @@ public class CompiledJavaPluginLaunchStrategy implements PluginLaunchStrategy {
LoadedNodeData data = cache.get(name); LoadedNodeData data = cache.get(name);
if(data != null) { if(data != null) {
byte[] bytes = data.bytes; byte[] bytes = data.bytes;
Class<?> klass = defineClass(data.node.name, bytes, 0, bytes.length); Class<?> klass = defineClass(data.node.name.replace("/", "."), bytes, 0, bytes.length);
ccache.put(name, klass); ccache.put(name, klass);
return klass; return klass;
} }