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

fix bad side efects of missing avination optional configuration

avinationmerge
UbitUmarov 2015-09-15 21:33:26 +01:00
parent 42954349e4
commit 19c5f9ce1d
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,6 +139,9 @@ namespace OpenSim.Services.Connectors
private string MapServer(string id) private string MapServer(string id)
{ {
if (m_UriMap.Count == 0)
return m_ServerURI;
UriBuilder serverUri = new UriBuilder(m_ServerURI); UriBuilder serverUri = new UriBuilder(m_ServerURI);
string prefix = id.Substring(0, 2).ToLower(); string prefix = id.Substring(0, 2).ToLower();
@ -164,7 +167,9 @@ namespace OpenSim.Services.Connectors
protected void retryCheck(object source, ElapsedEventArgs e) protected void retryCheck(object source, ElapsedEventArgs e)
{ {
m_retryCounter++; m_retryCounter++;
if (m_retryCounter > 60) m_retryCounter -= 60; if (m_retryCounter > 60)
m_retryCounter -= 60;
List<int> keys = new List<int>(); List<int> keys = new List<int>();
foreach (int a in m_retryQueue.Keys) foreach (int a in m_retryQueue.Keys)
{ {
@ -282,19 +287,19 @@ namespace OpenSim.Services.Connectors
rc.RequestMethod = "GET"; rc.RequestMethod = "GET";
Stream s = rc.Request(m_Auth); using (Stream s = rc.Request(m_Auth))
if (s == null)
return null;
if (s.Length > 0)
{ {
byte[] ret = new byte[s.Length]; if (s == null)
s.Read(ret, 0, (int)s.Length); return null;
return ret; if (s.Length > 0)
{
byte[] ret = new byte[s.Length];
s.Read(ret, 0, (int)s.Length);
return ret;
}
} }
return null; return null;
} }
} }