4 files changed, 28 insertions, 11 deletions

diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 7e81be7..205426e 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -29,6 +29,7 @@ using log4net;
 using System;
 using System.Threading;
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.IO;
 using System.Reflection;
 using System.Timers;
@@ -352,8 +353,7 @@ namespace OpenSim.Services.Connectors
             public string id;
         }
 
-        private OpenSim.Framework.BlockingQueue<QueuedAssetRequest> m_requestQueue =
-                new OpenSim.Framework.BlockingQueue<QueuedAssetRequest>();
+        private BlockingCollection<QueuedAssetRequest> m_requestQueue = new BlockingCollection<QueuedAssetRequest>();
 
         private void AssetRequestProcessor()
         {
@@ -361,10 +361,13 @@ namespace OpenSim.Services.Connectors
 
             while (true)
             {
-                r = m_requestQueue.Dequeue(4500);
-                Watchdog.UpdateThread();
-                if(r== null)
+                if(!m_requestQueue.TryTake(out r, 4500) || r == null)
+                {
+                    Watchdog.UpdateThread();
                     continue;
+                }
+
+                Watchdog.UpdateThread();
                 string uri = r.uri;
                 string id = r.id;
 
@@ -432,7 +435,7 @@ namespace OpenSim.Services.Connectors
                     QueuedAssetRequest request = new QueuedAssetRequest();
                     request.id = id;
                     request.uri = uri;
-                    m_requestQueue.Enqueue(request);
+                    m_requestQueue.Add(request);
                 }
             }
             else
diff --git a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs
index b9a6281..0971b38 100644
--- a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs
+++ b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs
@@ -195,6 +195,14 @@ namespace OpenSim.Services.Connectors
             string uri = m_ServerURI + string.Format("/estates/estate/?region={0}&create={1}", regionID, create);
 
             reply = MakeRequest("GET", uri, string.Empty);
+            if(reply == null)
+            {
+                // this is a fatal error
+                m_log.DebugFormat("[ESTATE CONNECTOR] connection to remote estates service failed");
+                m_log.DebugFormat("[ESTATE CONNECTOR] simulator needs to terminate");
+                Environment.Exit(-1);
+            }
+
             if (String.IsNullOrEmpty(reply))
                 return null;
 
@@ -308,7 +316,8 @@ namespace OpenSim.Services.Connectors
             string reply = string.Empty;
             try
             {
-                reply = SynchronousRestFormsRequester.MakeRequest(verb, uri, formdata, m_Auth);
+                reply = SynchronousRestFormsRequester.MakeRequest(verb, uri, formdata, 30, m_Auth);
+                return reply;
             }
             catch (WebException e)
             {
@@ -317,14 +326,17 @@ namespace OpenSim.Services.Connectors
                     if (hwr != null)
                     {
                         if (hwr.StatusCode == HttpStatusCode.NotFound)
+                        {
                             m_log.Error(string.Format("[ESTATE CONNECTOR]: Resource {0} not found ", uri));
+                            return reply;
+                        }
                         if (hwr.StatusCode == HttpStatusCode.Unauthorized)
                             m_log.Error(string.Format("[ESTATE CONNECTOR]: Web request {0} requires authentication ", uri));
                     }
                     else
                         m_log.Error(string.Format(
                             "[ESTATE CONNECTOR]: WebException for {0} {1} {2} {3}",
-                            verb, uri, formdata, e));
+                            verb, uri, formdata, e.Message));
                 }
             }
             catch (Exception e)
@@ -332,7 +344,7 @@ namespace OpenSim.Services.Connectors
                 m_log.DebugFormat("[ESTATE CONNECTOR]: Exception when contacting estate server at {0}: {1}", uri, e.Message);
             }
 
-            return reply;
+            return null;
         }
     }
 }
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
index 84c4efe..762d2f7 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
@@ -229,6 +229,7 @@ namespace OpenSim.Services.Connectors
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
                         reqString,
+                        30,
                         m_Auth);
                 if (reply != string.Empty)
                 {
@@ -271,7 +272,7 @@ namespace OpenSim.Services.Connectors
             {
                 // This just dumps a warning for any operation that takes more than 100 ms
                 int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
-                m_log.DebugFormat("[MAP IMAGE CONNECTOR]: map tile uploaded in {0}ms", tickdiff);
+                m_log.DebugFormat("[MAP IMAGE CONNECTOR]: map tile upload time {0}ms", tickdiff);
             }
 
             return false;
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index 5f075ac..9f3b94c 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -151,7 +151,8 @@ namespace OpenSim.Services.Connectors
                 os.Write(buffer, 0, strBuffer.Length);         //Send it
                 //m_log.InfoFormat("[REST COMMS]: Posted HelloNeighbour request to remote sim {0}", uri);
             }
-            catch (Exception e)
+//            catch (Exception e)
+            catch
             {
 //                m_log.WarnFormat(
 //                    "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}.  Exception {2}{3}",