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

Merge branch 'master' of https://github.com/andremussche/DelphiWebsockets

Browse source 
Conflicts:
	IdHTTPWebsocketClient.pas
This commit is contained in:
André Mussche 2014-03-07 12:21:09 +01:00
parent 13dbfbba4b 3903dac00e
commit fe6460566c
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
IdHTTPWebsocketClient.pas
View file

@ -1242,7 +1242,8 @@ begin
if ws <> nil then
ws.LastActivityTime := Now;
chn.ConnectTimeout := 1000;
chn.TryUpgradeToWebsocket;
if (chn.Host <> '') and (chn.Port > 0) then
chn.TryUpgradeToWebsocket;
except
//just try
end;

9
superobject/superobject.pas
View file

@ -6062,10 +6062,16 @@ function TSuperRttiContext.FromJson(TypeInfo: PTypeInfo; const obj: ISuperObject
begin
Result := True;
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
if f.FieldType <> nil then
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);
if Result then
f.SetValue(Value.AsObject, v) else
@ -6133,6 +6139,7 @@ function TSuperRttiContext.FromJson(TypeInfo: PTypeInfo; const obj: ISuperObject
Result := True;
for i := 0 to i - 1 do
begin
//val.Make(pb, el, val); copy old value
Result := FromJson(el, obj.AsArray[i], val);
if not Result then
Break;