davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Avoid NPE in SessionState.X.merge

This commit is contained in:
0xboobface 2018-11-09 18:19:59 +01:00
parent 9db844b5d1
commit dc540c795a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ctbrec/sites/mfc/X.java
View File

@ -37,8 +37,12 @@ public class X {
if(x == null) { if(x == null) {
return; return;
} }
fcext.merge(x.fcext); if (fcext != null) {
share.merge(x.share); fcext.merge(x.fcext);
}
if (share != null) {
share.merge(x.share);
}
additionalProperties.putAll(x.additionalProperties); additionalProperties.putAll(x.additionalProperties);
} }