Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.3h Improve debug output on json syntax exception

Browse Source
This commit is contained in:
BuildTools 2016-03-22 11:06:02 +01:00 committed by Olof Larsson
parent 8357b9f65e
commit 79b9fa8193
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/massivecraft/massivecore/store/Coll.java
View File

@ -24,6 +24,7 @@ import com.massivecraft.massivecore.util.Txt;
import com.massivecraft.massivecore.xlib.gson.Gson; import com.massivecraft.massivecore.xlib.gson.Gson;
import com.massivecraft.massivecore.xlib.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonElement;
import com.massivecraft.massivecore.xlib.gson.JsonObject; import com.massivecraft.massivecore.xlib.gson.JsonObject;
import com.massivecraft.massivecore.xlib.gson.JsonSyntaxException;
public class Coll<E extends Entity<E>> extends CollAbstract<E> public class Coll<E extends Entity<E>> extends CollAbstract<E>
{ {
@ -498,12 +499,23 @@ public class Coll<E extends Entity<E>> extends CollAbstract<E>
} }
} }
if ( ! this.remoteEntryIsOk(id, remoteEntry)) return;
JsonObject raw = remoteEntry.getKey(); JsonObject raw = remoteEntry.getKey();
Long mtime = remoteEntry.getValue(); Long mtime = remoteEntry.getValue();
if ( ! this.remoteEntryIsOk(id, remoteEntry)) return;
// Calculate temp but handle raw cases. // Calculate temp but handle raw cases.
E temp = this.getGson().fromJson(raw, this.getEntityClass()); E temp;
try
{
temp = this.getGson().fromJson(raw, this.getEntityClass());
}
catch (JsonSyntaxException ex)
{
logLoadError(id, ex.getMessage());
return;
}
E entity = this.getFixed(id, false); E entity = this.getFixed(id, false);
if (entity != null) if (entity != null)
{ {
@ -565,7 +577,7 @@ public class Coll<E extends Entity<E>> extends CollAbstract<E>
{ {
MassiveCore.get().log(Txt.parse("<b>Database could not load entity. You edited a file manually and made wrong JSON?")); MassiveCore.get().log(Txt.parse("<b>Database could not load entity. You edited a file manually and made wrong JSON?"));
MassiveCore.get().log(Txt.parse("<k>Entity: <v>%s", entityId)); MassiveCore.get().log(Txt.parse("<k>Entity: <v>%s", entityId));
MassiveCore.get().log(Txt.parse("<k>Collection: <v>%s", this.getName())); MassiveCore.get().log(Txt.parse("<k>Collection: <v>%s", this.getDebugName()));
MassiveCore.get().log(Txt.parse("<k>Error: <v>%s", error)); MassiveCore.get().log(Txt.parse("<k>Error: <v>%s", error));
} }