aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-05-26 15:26:22 +0000
committerdiva2009-05-26 15:26:22 +0000
commitbc2a22fb4ba3ea358d2e9bfdda776ef780dc4dc9 (patch)
treee4c5d2e1ca3e1cffc3f08af42a717f01b2e09be0
parentCommented a log message related to users not found, because it floods the log... (diff)
downloadopensim-SC-bc2a22fb4ba3ea358d2e9bfdda776ef780dc4dc9.zip
opensim-SC-bc2a22fb4ba3ea358d2e9bfdda776ef780dc4dc9.tar.gz
opensim-SC-bc2a22fb4ba3ea358d2e9bfdda776ef780dc4dc9.tar.bz2
opensim-SC-bc2a22fb4ba3ea358d2e9bfdda776ef780dc4dc9.tar.xz
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.
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs12
1 files changed, 10 insertions, 2 deletions
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
195 195
196 string uri = m_ServerURI + "/assets/"; 196 string uri = m_ServerURI + "/assets/";
197 197
198 string newID = SynchronousRestObjectRequester. 198 string newID = string.Empty;
199 MakeRequest<AssetBase, string>("POST", uri, asset); 199 try
200 {
201 newID = SynchronousRestObjectRequester.
202 MakeRequest<AssetBase, string>("POST", uri, asset);
203 }
204 catch (Exception e)
205 {
206 m_log.WarnFormat("[ASSET CONNECTOR]: Unable to send asset {0} to asset server. Reason: {1}", asset.ID, e.Message);
207 }
200 208
201 if (newID != String.Empty) 209 if (newID != String.Empty)
202 { 210 {