X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosJson.java;h=22f81d037c06ef43907fb633e8fa3a5c5bf46877;hp=346144d97e07ef409f2c5d25b80b37fda1ea3856;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=e8250fcb267a34fbbd8b88c6dcc8eec419bbcc68

diff --git a/altoslib/AltosJson.java b/altoslib/AltosJson.java
index 346144d9..22f81d03 100644
--- a/altoslib/AltosJson.java
+++ b/altoslib/AltosJson.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -1063,7 +1064,7 @@ public class AltosJson extends JsonUtil {
 				} 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();
@@ -1208,7 +1209,7 @@ public class AltosJson extends JsonUtil {
 			}
 		} 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();