aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs22
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index bdc3bef..3fa8b54 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Connectors
55 private List<AssetBase>[] m_sendRetries = new List<AssetBase>[MAXSENDRETRIESLEN]; 55 private List<AssetBase>[] m_sendRetries = new List<AssetBase>[MAXSENDRETRIESLEN];
56 private System.Timers.Timer m_retryTimer; 56 private System.Timers.Timer m_retryTimer;
57 private int m_maxAssetRequestConcurrency = 30; 57 private int m_maxAssetRequestConcurrency = 30;
58 58
59 private delegate void AssetRetrievedEx(AssetBase asset); 59 private delegate void AssetRetrievedEx(AssetBase asset);
60 60
61 // Keeps track of concurrent requests for the same asset, so that it's only loaded once. 61 // Keeps track of concurrent requests for the same asset, so that it's only loaded once.
@@ -150,7 +150,7 @@ namespace OpenSim.Services.Connectors
150 string prefix = id.Substring(0, 2).ToLower(); 150 string prefix = id.Substring(0, 2).ToLower();
151 151
152 string host; 152 string host;
153 153
154 // HG URLs will not be valid UUIDS 154 // HG URLs will not be valid UUIDS
155 if (m_UriMap.ContainsKey(prefix)) 155 if (m_UriMap.ContainsKey(prefix))
156 host = m_UriMap[prefix]; 156 host = m_UriMap[prefix];
@@ -180,11 +180,11 @@ namespace OpenSim.Services.Connectors
180 if(m_retryCounter >= 61 ) // avoid overflow 60 is max in use below 180 if(m_retryCounter >= 61 ) // avoid overflow 60 is max in use below
181 m_retryCounter = 1; 181 m_retryCounter = 1;
182 182
183 int inUse = 0; 183 int inUse = 0;
184 int nextlevel; 184 int nextlevel;
185 int timefactor; 185 int timefactor;
186 List<AssetBase> retrylist; 186 List<AssetBase> retrylist;
187 // we need to go down 187 // we need to go down
188 for(int i = MAXSENDRETRIESLEN - 1; i >= 0; i--) 188 for(int i = MAXSENDRETRIESLEN - 1; i >= 0; i--)
189 { 189 {
190 lock(m_sendRetries) 190 lock(m_sendRetries)
@@ -219,13 +219,13 @@ namespace OpenSim.Services.Connectors
219 lock(m_sendRetries) 219 lock(m_sendRetries)
220 m_sendRetries[i] = null; 220 m_sendRetries[i] = null;
221 221
222 // we are the only ones with a copy of this retrylist now 222 // we are the only ones with a copy of this retrylist now
223 foreach(AssetBase ass in retrylist) 223 foreach(AssetBase ass in retrylist)
224 retryStore(ass, nextlevel); 224 retryStore(ass, nextlevel);
225 } 225 }
226 226
227 lock(m_sendRetries) 227 lock(m_sendRetries)
228 { 228 {
229 if(inUse == 0 ) 229 if(inUse == 0 )
230 m_retryTimer.Stop(); 230 m_retryTimer.Stop();
231 231
@@ -245,7 +245,7 @@ namespace OpenSim.Services.Connectors
245 AssetBase asset = null; 245 AssetBase asset = null;
246 if (m_Cache != null) 246 if (m_Cache != null)
247 asset = m_Cache.Get(id); 247 asset = m_Cache.Get(id);
248 248
249 if (asset == null || asset.Data == null || asset.Data.Length == 0) 249 if (asset == null || asset.Data == null || asset.Data.Length == 0)
250 { 250 {
251 // XXX: Commented out for now since this has either never been properly operational or not for some time 251 // XXX: Commented out for now since this has either never been properly operational or not for some time
@@ -259,7 +259,7 @@ namespace OpenSim.Services.Connectors
259 259
260 asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, m_Auth); 260 asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, m_Auth);
261 261
262 262
263 if (m_Cache != null) 263 if (m_Cache != null)
264 { 264 {
265 if (asset != null) 265 if (asset != null)
@@ -438,7 +438,7 @@ namespace OpenSim.Services.Connectors
438 // This is most likely to happen because the server doesn't support this function, 438 // This is most likely to happen because the server doesn't support this function,
439 // so just silently return "doesn't exist" for all the assets. 439 // so just silently return "doesn't exist" for all the assets.
440 } 440 }
441 441
442 if (exist == null) 442 if (exist == null)
443 exist = new bool[ids.Length]; 443 exist = new bool[ids.Length];
444 444
@@ -557,7 +557,7 @@ namespace OpenSim.Services.Connectors
557 if(nextRetryLevel >= MAXSENDRETRIESLEN) 557 if(nextRetryLevel >= MAXSENDRETRIESLEN)
558 m_log.WarnFormat("[Assets] Upload giveup after several retries id: {0} type {1}", 558 m_log.WarnFormat("[Assets] Upload giveup after several retries id: {0} type {1}",
559 asset.ID.ToString(), asset.Type.ToString()); 559 asset.ID.ToString(), asset.Type.ToString());
560 else 560 else
561 { 561 {
562 lock(m_sendRetries) 562 lock(m_sendRetries)
563 { 563 {