cmueller/DelphiWebsockets
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

superobject: get current value/object (so objects are not created every time and overwritten -> mem leak)

Browse source
This commit is contained in:
André Mussche 2014-02-14 15:48:26 +01:00
parent 78e7556876
commit 3903dac00e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
superobject/superobject.pas
View file

@ -6062,10 +6062,16 @@ function TSuperRttiContext.FromJson(TypeInfo: PTypeInfo; const obj: ISuperObject
begin begin
Result := True; Result := True;
if Value.Kind <> tkClass then if Value.Kind <> tkClass then
Value := GetTypeData(TypeInfo).ClassType.Create; begin
//only create if emtpy
if Value.IsEmpty then
Value := GetTypeData(TypeInfo).ClassType.Create;
end;
for f in Context.GetType(Value.AsObject.ClassType).GetFields do for f in Context.GetType(Value.AsObject.ClassType).GetFields do
if f.FieldType <> nil then if f.FieldType <> nil then
begin begin
//get current value/object (so objects are not created every time and overwritten -> mem leak
v := f.GetValue(Value.AsObject);
Result := FromJson(f.FieldType.Handle, GetFieldDefault(f, obj.AsObject[GetFieldName(f)]), v); Result := FromJson(f.FieldType.Handle, GetFieldDefault(f, obj.AsObject[GetFieldName(f)]), v);
if Result then if Result then
f.SetValue(Value.AsObject, v) else f.SetValue(Value.AsObject, v) else
@ -6133,6 +6139,7 @@ function TSuperRttiContext.FromJson(TypeInfo: PTypeInfo; const obj: ISuperObject
Result := True; Result := True;
for i := 0 to i - 1 do for i := 0 to i - 1 do
begin begin
//val.Make(pb, el, val); copy old value
Result := FromJson(el, obj.AsArray[i], val); Result := FromJson(el, obj.AsArray[i], val);
if not Result then if not Result then
Break; Break;