From c23d37a509bc6ca7bdcba91a61dfd9fb4014639e Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 14 May 2014 00:11:07 +0100
Subject: [PATCH] Fix recent asset request timeout issue by commenting out (for
 now) the m_maxAssetRequestConcurrency mistakenly passed in as a timeout to
 SynchronousRestObjectRequester.MakeRequest()

For a long time, possibly forever, the m_maxAssetRequestConcurrency was mistakenly passed in as a 30 ms timeout rather than as a concurrent connection limiter.
This didn't come to light until the timeout was actually used in recent commit faf9ba53
Since this hasn't been operational for a long time and in release candidate phase, commenting it out for now though will need to revisit this.
Relates to http://opensimulator.org/mantis/view.php?id=7165
---
 .../Asset/AssetServicesConnector.cs           | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index ee047e0a61..2ba8e043ef 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -117,8 +117,16 @@ namespace OpenSim.Services.Connectors
 
             if (asset == null)
             {
-                asset = SynchronousRestObjectRequester.
-                        MakeRequest<int, AssetBase>("GET", uri, 0, m_maxAssetRequestConcurrency);
+                // XXX: Commented out for now since this has either never been properly operational or not for some time
+                // as m_maxAssetRequestConcurrency was being passed as the timeout, not a concurrency limiting option.
+                // Wasn't noticed before because timeout wasn't actually used.
+                // Not attempting concurrency setting for now as this omission was discovered in release candidate
+                // phase for OpenSimulator 0.8.  Need to revisit afterwards.
+//                asset
+//                    = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>(
+//                        "GET", uri, 0, m_maxAssetRequestConcurrency);
+
+                asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0);
 
                 if (m_Cache != null)
                     m_Cache.Cache(asset);
@@ -148,8 +156,7 @@ namespace OpenSim.Services.Connectors
 
             string uri = m_ServerURI + "/assets/" + id + "/metadata";
 
-            AssetMetadata asset = SynchronousRestObjectRequester.
-                    MakeRequest<int, AssetMetadata>("GET", uri, 0);
+            AssetMetadata asset = SynchronousRestObjectRequester.MakeRequest<int, AssetMetadata>("GET", uri, 0);
             return asset;
         }
 
@@ -290,8 +297,7 @@ namespace OpenSim.Services.Connectors
             string newID;
             try
             {
-                newID = SynchronousRestObjectRequester.
-                        MakeRequest<AssetBase, string>("POST", uri, asset);
+                newID = SynchronousRestObjectRequester.MakeRequest<AssetBase, string>("POST", uri, asset);
             }
             catch (Exception e)
             {
@@ -337,8 +343,7 @@ namespace OpenSim.Services.Connectors
 
             string uri = m_ServerURI + "/assets/" + id;
 
-            if (SynchronousRestObjectRequester.
-                    MakeRequest<AssetBase, bool>("POST", uri, asset))
+            if (SynchronousRestObjectRequester.MakeRequest<AssetBase, bool>("POST", uri, asset))
             {
                 if (m_Cache != null)
                     m_Cache.Cache(asset);
@@ -352,8 +357,7 @@ namespace OpenSim.Services.Connectors
         {
             string uri = m_ServerURI + "/assets/" + id;
 
-            if (SynchronousRestObjectRequester.
-                    MakeRequest<int, bool>("DELETE", uri, 0))
+            if (SynchronousRestObjectRequester.MakeRequest<int, bool>("DELETE", uri, 0))
             {
                 if (m_Cache != null)
                     m_Cache.Expire(id);