diff options
author | Justin Clark-Casey (justincc) | 2009-11-12 18:26:22 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-12 18:26:22 +0000 |
commit | bb92ba97c6952c60f5bdd50b1c6599894bfef501 (patch) | |
tree | 6d1cce7b98b06549fc91dbdafa94c42f64437c5b /OpenSim/Tests | |
parent | minor: refactor common setup in uuid gatherer test (diff) | |
download | opensim-SC_OLD-bb92ba97c6952c60f5bdd50b1c6599894bfef501.zip opensim-SC_OLD-bb92ba97c6952c60f5bdd50b1c6599894bfef501.tar.gz opensim-SC_OLD-bb92ba97c6952c60f5bdd50b1c6599894bfef501.tar.bz2 opensim-SC_OLD-bb92ba97c6952c60f5bdd50b1c6599894bfef501.tar.xz |
Stop iar save failing on corrupt assets
Not ideal since one will still have to watch out for big 'corrupt asset' messages in the log, but better than an outright fail
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestAssetService.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/TestAssetService.cs index ff75d86..a537b97 100644 --- a/OpenSim/Tests/Common/Mock/TestAssetService.cs +++ b/OpenSim/Tests/Common/Mock/TestAssetService.cs | |||
@@ -27,6 +27,8 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
31 | using log4net; | ||
30 | using OpenMetaverse; | 32 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
32 | using OpenSim.Data; | 34 | using OpenSim.Data; |
@@ -37,6 +39,8 @@ namespace OpenSim.Tests.Common.Mock | |||
37 | { | 39 | { |
38 | public class TestAssetService : IAssetService | 40 | public class TestAssetService : IAssetService |
39 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | |||
40 | private readonly Dictionary<string, AssetBase> Assets = new Dictionary<string, AssetBase>(); | 44 | private readonly Dictionary<string, AssetBase> Assets = new Dictionary<string, AssetBase>(); |
41 | 45 | ||
42 | public TestAssetService() {} | 46 | public TestAssetService() {} |
@@ -50,6 +54,8 @@ namespace OpenSim.Tests.Common.Mock | |||
50 | 54 | ||
51 | public AssetBase Get(string id) | 55 | public AssetBase Get(string id) |
52 | { | 56 | { |
57 | m_log.DebugFormat("[MOCK ASSET SERVICE]: Getting asset with id {0}", id); | ||
58 | |||
53 | AssetBase asset; | 59 | AssetBase asset; |
54 | if (Assets.ContainsKey(id)) | 60 | if (Assets.ContainsKey(id)) |
55 | asset = Assets[id]; | 61 | asset = Assets[id]; |
@@ -78,6 +84,8 @@ namespace OpenSim.Tests.Common.Mock | |||
78 | 84 | ||
79 | public string Store(AssetBase asset) | 85 | public string Store(AssetBase asset) |
80 | { | 86 | { |
87 | m_log.DebugFormat("[MOCK ASSET SERVICE]: Storing asset {0}", asset.ID); | ||
88 | |||
81 | Assets[asset.ID] = asset; | 89 | Assets[asset.ID] = asset; |
82 | 90 | ||
83 | return asset.ID; | 91 | return asset.ID; |