OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync code that has moved in development branch with changes in master

0.8.0.3
BlueWall 2014-02-01 07:57:04 -05:00
parent fce3fca7f9
commit 9aec36156e
1 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,9 +95,12 @@ namespace OpenSim.Framework.Servers.HttpServer
webRequest.ContentType = "application/json-rpc"; webRequest.ContentType = "application/json-rpc";
webRequest.Method = "POST"; webRequest.Method = "POST";
Stream dataStream = webRequest.GetRequestStream(); //Stream dataStream = webRequest.GetRequestStream();
dataStream.Write(content, 0, content.Length); //dataStream.Write(content, 0, content.Length);
dataStream.Close(); //dataStream.Close();
using (Stream dataStream = webRequest.GetRequestStream())
dataStream.Write(content, 0, content.Length);
WebResponse webResponse = null; WebResponse webResponse = null;
try try
@ -111,26 +114,18 @@ namespace OpenSim.Framework.Servers.HttpServer
return false; return false;
} }
Stream rstream = webResponse.GetResponseStream(); using (webResponse)
using (Stream rstream = webResponse.GetResponseStream())
OSDMap mret = new OSDMap();
try
{ {
mret = (OSDMap)OSDParser.DeserializeJson(rstream); OSDMap mret = (OSDMap)OSDParser.DeserializeJson(rstream);
if (mret.ContainsKey("error"))
return false;
// get params...
OSD.DeserializeMembers(ref parameters, (OSDMap)mret["result"]);
return true;
} }
catch (Exception e)
{
m_log.DebugFormat("[JSONRPC]: JsonRpcRequest Error {0}", e.Message);
return false;
}
if (mret.ContainsKey("error"))
return false;
// get params...
OSD.DeserializeMembers(ref parameters, (OSDMap) mret["result"]);
return true;
} }
/// <summary> /// <summary>
@ -171,10 +166,9 @@ namespace OpenSim.Framework.Servers.HttpServer
webRequest.ContentType = "application/json-rpc"; webRequest.ContentType = "application/json-rpc";
webRequest.Method = "POST"; webRequest.Method = "POST";
Stream dataStream = webRequest.GetRequestStream(); using (Stream dataStream = webRequest.GetRequestStream())
dataStream.Write(content, 0, content.Length); dataStream.Write(content, 0, content.Length);
dataStream.Close();
WebResponse webResponse = null; WebResponse webResponse = null;
try try
{ {
@ -187,28 +181,30 @@ namespace OpenSim.Framework.Servers.HttpServer
return false; return false;
} }
Stream rstream = webResponse.GetResponseStream(); using (webResponse)
using (Stream rstream = webResponse.GetResponseStream())
OSDMap response = new OSDMap();
try
{ {
response = (OSDMap)OSDParser.DeserializeJson(rstream); OSDMap response = new OSDMap();
try
{
response = (OSDMap)OSDParser.DeserializeJson(rstream);
}
catch (Exception e)
{
m_log.DebugFormat("[JSONRPC]: JsonRpcRequest Error {0}", e.Message);
return false;
}
if (response.ContainsKey("error"))
{
data = response["error"];
return false;
}
data = response;
return true;
} }
catch (Exception e)
{
m_log.DebugFormat("[JSONRPC]: JsonRpcRequest Error {0}", e.Message);
return false;
}
if(response.ContainsKey("error"))
{
data = response["error"];
return false;
}
data = response;
return true;
} }
#endregion Web Util #endregion Web Util
} }