ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2021-09-05 20:25:36 +01:00
parent 8769abcd72
commit f085e9a5e8
4 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
View File

@@ -97,34 +97,30 @@ namespace OpenSim.Framework.Servers.HttpServer
return false;
}
if (!response.ContainsKey("_Result"))
OSD osdtmp;
if (!response.TryGetValue("_Result", out osdtmp) || !(osdtmp is OSDMap))
{
m_log.DebugFormat("JsonRpc request '{0}' to {1} returned an invalid response: {2}",
method, uri, OSDParser.SerializeJsonString(response));
return false;
}
response = (OSDMap)response["_Result"];
OSD data;
if (response.ContainsKey("error"))
response = osdtmp as OSDMap;
if (response.TryGetValue("error", out osdtmp))
{
data = response["error"];
m_log.DebugFormat("JsonRpc request '{0}' to {1} returned an error: {2}",
method, uri, OSDParser.SerializeJsonString(data));
method, uri, OSDParser.SerializeJsonString(osdtmp));
return false;
}
if (!response.ContainsKey("result"))
if (!response.TryGetValue("result", out osdtmp) || !(osdtmp is OSDMap))
{
m_log.DebugFormat("JsonRpc request '{0}' to {1} returned an invalid response: {2}",
method, uri, OSDParser.SerializeJsonString(response));
return false;
}
data = response["result"];
OSD.DeserializeMembers(ref parameters, (OSDMap)data);
OSD.DeserializeMembers(ref parameters, (OSDMap)osdtmp);
return true;
}
@@ -168,19 +164,20 @@ namespace OpenSim.Framework.Servers.HttpServer
return false;
}
if (!response.ContainsKey("_Result"))
OSD osdtmp;
if (!response.TryGetValue("_Result", out osdtmp) || !(osdtmp is OSDMap))
{
m_log.DebugFormat("JsonRpc request '{0}' to {1} returned an invalid response: {2}",
method, uri, OSDParser.SerializeJsonString(response));
return false;
}
response = (OSDMap)response["_Result"];
response = osdtmp as OSDMap;
if (response.ContainsKey("error"))
if (response.TryGetValue("error", out osdtmp))
{
data = response["error"];
data = osdtmp;
m_log.DebugFormat("JsonRpc request '{0}' to {1} returned an error: {2}",
method, uri, OSDParser.SerializeJsonString(data));
method, uri, OSDParser.SerializeJsonString(osdtmp));
return false;
}

1
OpenSim/Framework/Servers/HttpServer/OSHttpServer/ContextTimeoutManager.cs
View File

@@ -31,7 +31,6 @@ using System.Diagnostics;
using System.Globalization;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
namespace OSHttpServer
{

1
OpenSim/Framework/Servers/HttpServer/OSHttpServer/IHttpClientContext.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.Net;
using System.Net.Sockets;
using System.Threading.Tasks;
namespace OSHttpServer
{