projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Stop reflective JSON class walk at Object instead of null
[fw/altos]
/
altoslib
/
AltosJson.java
diff --git
a/altoslib/AltosJson.java
b/altoslib/AltosJson.java
index 346144d97e07ef409f2c5d25b80b37fda1ea3856..67f3a00ad3fdc2502e7921cc962ad98b5a8e5bb1 100644
(file)
--- a/
altoslib/AltosJson.java
+++ b/
altoslib/AltosJson.java
@@
-1063,7
+1063,7
@@
public class AltosJson extends JsonUtil {
} else {
object = c.newInstance();
}
} else {
object = c.newInstance();
}
- for (; c !=
null
; c = c.getSuperclass()) {
+ for (; c !=
Object.class
; c = c.getSuperclass()) {
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
Class fieldClass = field.getType();
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
Class fieldClass = field.getType();
@@
-1208,7
+1208,7
@@
public class AltosJson extends JsonUtil {
}
} else {
assert_hash(true);
}
} else {
assert_hash(true);
- for (Class c = object.getClass(); c !=
null
; c = c.getSuperclass()) {
+ for (Class c = object.getClass(); c !=
Object.class
; c = c.getSuperclass()) {
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();