From bc2a22fb4ba3ea358d2e9bfdda776ef780dc4dc9 Mon Sep 17 00:00:00 2001
From: diva
Date: Tue, 26 May 2009 15:26:22 +0000
Subject: Catching exceptions on Store, including timeout. Store may fail, for
 whatever reason, but it won't crash the sim. Addresses mantis #3707, mantis
 #3713, mantis #3686.

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 0903164..950cf47 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -195,8 +195,16 @@ namespace OpenSim.Services.Connectors
 
             string uri = m_ServerURI + "/assets/";
 
-            string newID = SynchronousRestObjectRequester.
-                    MakeRequest<AssetBase, string>("POST", uri, asset);
+            string newID = string.Empty;
+            try
+            {
+                newID = SynchronousRestObjectRequester.
+                        MakeRequest<AssetBase, string>("POST", uri, asset);
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[ASSET CONNECTOR]: Unable to send asset {0} to asset server. Reason: {1}", asset.ID, e.Message);
+            }
 
             if (newID != String.Empty)
             {
-- 
cgit v1.1