aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-04 21:19:00 +0000
committerJustin Clarke Casey2008-11-04 21:19:00 +0000
commit9848dc77cc912d92f4415139540be10349dee7e1 (patch)
tree8e6806e1e594d12c528b543b7745de2b4aaa668a
parentFrom: Rob Smart <SMARTROB@uk.ibm.com> (diff)
downloadopensim-SC_OLD-9848dc77cc912d92f4415139540be10349dee7e1.zip
opensim-SC_OLD-9848dc77cc912d92f4415139540be10349dee7e1.tar.gz
opensim-SC_OLD-9848dc77cc912d92f4415139540be10349dee7e1.tar.bz2
opensim-SC_OLD-9848dc77cc912d92f4415139540be10349dee7e1.tar.xz
* Stop an exception in getting assets for the archiver from crashing the sim
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs23
1 files changed, 16 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
index 41fbc16..035651a 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
@@ -25,15 +25,16 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using System.Threading;
32using OpenMetaverse;
33using log4net;
28using OpenSim.Framework; 34using OpenSim.Framework;
29using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
30using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
31using OpenSim.Region.Environment.Scenes; 37using OpenSim.Region.Environment.Scenes;
32using System.Collections.Generic;
33//using System.Reflection;
34using System.Threading;
35using OpenMetaverse;
36//using log4net;
37 38
38namespace OpenSim.Region.Environment.Modules.World.Archiver 39namespace OpenSim.Region.Environment.Modules.World.Archiver
39{ 40{
@@ -42,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
42 /// </summary> 43 /// </summary>
43 class AssetsRequest 44 class AssetsRequest
44 { 45 {
45 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 47
47 /// <summary> 48 /// <summary>
48 /// uuids to request 49 /// uuids to request
@@ -123,7 +124,15 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
123 /// </summary> 124 /// </summary>
124 protected void PerformAssetsRequestCallback() 125 protected void PerformAssetsRequestCallback()
125 { 126 {
126 m_assetsRequestCallback(m_assets, m_notFoundAssetUuids); 127 try
128 {
129 m_assetsRequestCallback(m_assets, m_notFoundAssetUuids);
130 }
131 catch (Exception e)
132 {
133 m_log.ErrorFormat(
134 "[ARCHIVER]: Terminating archive creation since asset requster callback failed with {0}", e);
135 }
127 } 136 }
128 } 137 }
129} 138}