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

revert SynchronousRestObjectRequester timeout to miliseconds, and fix where it was wrong set in seconds

avinationmerge
UbitUmarov 2015-09-09 23:17:18 +01:00
parent 5e12bc452d
commit b93412972e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/WebUtil.cs
View File

@ -1246,7 +1246,7 @@ namespace OpenSim.Framework
auth.AddAuthorization(ht.Headers); auth.AddAuthorization(ht.Headers);
if (pTimeout != 0) if (pTimeout != 0)
request.Timeout = pTimeout * 1000; request.Timeout = pTimeout;
if (maxConnections > 0 && ht.ServicePoint.ConnectionLimit < maxConnections) if (maxConnections > 0 && ht.ServicePoint.ConnectionLimit < maxConnections)
ht.ServicePoint.ConnectionLimit = maxConnections; ht.ServicePoint.ConnectionLimit = maxConnections;

4
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

@ -322,7 +322,7 @@ namespace OpenSim.Services.Connectors
bool success = false; bool success = false;
try try
{ {
AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30); AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30000);
if (a != null) if (a != null)
{ {
if (m_Cache != null) if (m_Cache != null)
@ -481,7 +481,7 @@ namespace OpenSim.Services.Connectors
try try
{ {
newID = SynchronousRestObjectRequester. newID = SynchronousRestObjectRequester.
MakeRequest<AssetBase, string>("POST", uri, asset, 100); MakeRequest<AssetBase, string>("POST", uri, asset, 100000);
if (newID == null || newID == "") if (newID == null || newID == "")
{ {
newID = UUID.Zero.ToString(); newID = UUID.Zero.ToString();