github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-31 07:12:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core/RPC: Fixed issue with JsonRPC null Date

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9197 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-11-20 11:35:29 +00:00
parent 9a9ab2a842
commit 92a70c7ef4
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/JSON.cpp
View file

@ -46,7 +46,7 @@ Value ParseJSON(CParser& p)
break;
p.PassChar(',');
}
return va;
return va;
}
p.ThrowError("Unrecognized JSON element");
return Null;

4
uppsrc/Core/Rpc/imp/Client.cpp
View file

@ -70,7 +70,7 @@ RpcGet RpcRequest::Retry()
Value JsonRpcData(const Value& v)
{
if(IsDateTime(v))
if(IsDateTime(v) && !IsNull(v))
return FormatIso8601(v);
return v;
}
@ -128,7 +128,7 @@ RpcGet RpcRequest::Execute()
}
String response;
New();
if(shorted)
if(shorted)
response = RpcExecute(request, "", "127.0.0.1");
else
response = Post(request).Execute();