eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

JIRA #334 - check for null classreader

Browse Source
This commit is contained in:
Guus C. Bloemsma 2018-04-08 16:37:31 +02:00 committed by Alexey Andreev
parent d9c5b3fd04
commit 744eb39e6d
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
metaprogramming/impl/src/main/java/org/teavm/metaprogramming/impl/reflect/ReflectClassImpl.java
View File

@ -335,14 +335,19 @@ public class ReflectClassImpl<T> implements ReflectClass<T> {
@Override @Override
public ReflectField[] getFields() { public ReflectField[] getFields() {
if (fieldsCache == null) { if (fieldsCache == null) {
Set<String> visited = new HashSet<>(); resolve();
fieldsCache = context.getClassSource() if (classReader == null) {
.getAncestors(classReader.getName()) fieldsCache = new ReflectField[0];
.flatMap(cls -> cls.getFields().stream().filter(fld -> fld.getLevel() == AccessLevel.PUBLIC)) } else {
.filter(fld -> visited.add(fld.getName())) Set<String> visited = new HashSet<>();
.map(fld -> context.getClass(ValueType.object(fld.getOwnerName())) fieldsCache = context
.getDeclaredField(fld.getName())) .getClassSource()
.toArray(ReflectField[]::new); .getAncestors(classReader.getName())
.flatMap(cls -> cls.getFields().stream().filter(fld -> fld.getLevel() == AccessLevel.PUBLIC))
.filter(fld -> visited.add(fld.getName()))
.map(fld -> context.getClass(ValueType.object(fld.getOwnerName())).getDeclaredField(fld.getName()))
.toArray(ReflectField[]::new);
}
} }
return fieldsCache.clone(); return fieldsCache.clone();
} }