ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing NPE when the extra_info is null in the DB

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2022-11-09 22:44:31 -06:00
parent 91c123231b
commit 9386774abd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/pc_promo_selection.xcf
View File

Binary file not shown.

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java
View File

@@ -224,8 +224,10 @@ public class CollectionSerializer {
JSONParser parser = new JSONParser();
try {
JSONObject object = (JSONObject) parser.parse(coll.extra_info);
newColl.setExtraInformation(object);
if(coll.extra_info != null) {
JSONObject object = (JSONObject) parser.parse(coll.extra_info);
newColl.setExtraInformation(object);
}
} catch (ParseException exp) {
throw new IOException(exp);
}