diff options
author | Justin Clarke Casey | 2008-11-04 21:19:00 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-04 21:19:00 +0000 |
commit | 9848dc77cc912d92f4415139540be10349dee7e1 (patch) | |
tree | 8e6806e1e594d12c528b543b7745de2b4aaa668a /OpenSim/Region/Environment | |
parent | From: Rob Smart <SMARTROB@uk.ibm.com> (diff) | |
download | opensim-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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs | 23 |
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 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Reflection; | ||
31 | using System.Threading; | ||
32 | using OpenMetaverse; | ||
33 | using log4net; | ||
28 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
29 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
30 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Environment.Interfaces; |
31 | using OpenSim.Region.Environment.Scenes; | 37 | using OpenSim.Region.Environment.Scenes; |
32 | using System.Collections.Generic; | ||
33 | //using System.Reflection; | ||
34 | using System.Threading; | ||
35 | using OpenMetaverse; | ||
36 | //using log4net; | ||
37 | 38 | ||
38 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 39 | namespace 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 | } |