sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed two problems with asset manager:

Browse Source 
1. can't load classes from asset class loaders.
2. can't load resources from asset class loaders.
This commit is contained in:
javasabr 2017-08-25 15:12:38 +03:00 committed by Rémy Bouquet
parent abab0a553f
commit fac8266b5c
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jme3-core/src/main/java/com/jme3/export/SavableClassUtil.java
View File

@ -34,6 +34,7 @@ package com.jme3.export;
import com.jme3.animation.Animation;
import com.jme3.effect.shapes.*;
import com.jme3.material.MatParamTexture;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.ArrayList;
@ -187,16 +188,21 @@ public class SavableClassUtil {
if (loaders == null) {
return fromName(className);
}
String newClassName = remapClass(className);
synchronized(loaders) {
for (ClassLoader classLoader : loaders){
synchronized (loaders) {
for (ClassLoader classLoader : loaders) {
final Class<?> loadedClass;
try {
return (Savable) classLoader.loadClass(newClassName).newInstance();
loadedClass = classLoader.loadClass(newClassName);
} catch (final ClassNotFoundException e) {
continue;
}
try {
return (Savable) loadedClass.newInstance();
} catch (InstantiationException e) {
} catch (IllegalAccessException e) {
}
}
}

12
jme3-core/src/plugins/java/com/jme3/asset/plugins/ClasspathLocator.java
View File

@ -37,6 +37,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.List;
import java.util.logging.Logger;
/**
@ -90,6 +91,17 @@ public class ClasspathLocator implements AssetLocator {
}else{
url = Thread.currentThread().getContextClassLoader().getResource(name);
}
if (url == null) {
final List<ClassLoader> classLoaders = manager.getClassLoaders();
for (final ClassLoader classLoader : classLoaders) {
url = classLoader.getResource(name);
if(url != null) {
break;
}
}
}
if (url == null)
return null;