OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Stop an exception in getting assets for the archiver from crashing the sim

0.6.0-stable
Justin Clarke Casey 2008-11-04 21:19:00 +00:00
parent ea27b95f8e
commit 9848dc77cc
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/Environment/Modules/World/Archiver/AssetsRequest.cs
View File

@ -25,15 +25,16 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
using OpenMetaverse;
using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using System.Collections.Generic;
//using System.Reflection;
using System.Threading;
using OpenMetaverse;
//using log4net;
namespace OpenSim.Region.Environment.Modules.World.Archiver namespace OpenSim.Region.Environment.Modules.World.Archiver
{ {
@ -42,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// </summary> /// </summary>
class AssetsRequest class AssetsRequest
{ {
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary> /// <summary>
/// uuids to request /// uuids to request
@ -122,8 +123,16 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// Perform the callback on the original requester of the assets /// Perform the callback on the original requester of the assets
/// </summary> /// </summary>
protected void PerformAssetsRequestCallback() protected void PerformAssetsRequestCallback()
{
try
{ {
m_assetsRequestCallback(m_assets, m_notFoundAssetUuids); m_assetsRequestCallback(m_assets, m_notFoundAssetUuids);
} }
catch (Exception e)
{
m_log.ErrorFormat(
"[ARCHIVER]: Terminating archive creation since asset requster callback failed with {0}", e);
}
}
} }
} }