paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-31 17:10:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions r46308 from trunk:

Browse Source 
------------------------------------------------------------------------
    r46308 | michael | 2020-08-07 16:07:59 +0200 (Fri, 07 Aug 2020) | 1 line
    
    * Add jdoIgnoreNulls
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@46614 -
This commit is contained in:
michael 2020-08-23 09:32:26 +00:00
parent a92e9b9181
commit 834ceb69b5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/fcl-json/src/fpjsonrtti.pp
View File

@ -113,7 +113,7 @@ Type
TJSONRestorePropertyEvent = Procedure (Sender : TObject; AObject : TObject; Info : PPropInfo; AValue : TJSONData; Var Handled : Boolean) of object;
TJSONPropertyErrorEvent = Procedure (Sender : TObject; AObject : TObject; Info : PPropInfo; AValue : TJSONData; Error : Exception; Var Continue : Boolean) of object;
TJSONGetObjectEvent = Procedure (Sender : TOBject; AObject : TObject; Info : PPropInfo; AData : TJSONObject; DataName : TJSONStringType; Var AValue : TObject);
TJSONDestreamOption = (jdoCaseInsensitive,jdoIgnorePropertyErrors);
TJSONDestreamOption = (jdoCaseInsensitive,jdoIgnorePropertyErrors,jdoIgnoreNulls);
TJSONDestreamOptions = set of TJSONDestreamOption;
TJSONDeStreamer = Class(TJSONFiler)
@ -397,7 +397,9 @@ begin
If B then
exit;
end;
DoRestoreProperty(AObject,PropInfo,PropData);
if (PropData.JSONType=jtNull) then
if Not (jdoIgnoreNulls in Options) then
DoRestoreProperty(AObject,PropInfo,PropData);
except
On E : Exception do
If Assigned(FOnPropError) then