diff options
author | Justin Clark-Casey (justincc) | 2009-11-25 16:14:08 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-25 16:14:08 +0000 |
commit | a4d2a97bc6ead3aeba4e1be419d976925e5ee470 (patch) | |
tree | af1247d02ca2aeca85e9ee2815f35cd7b1249244 /OpenSim/Framework | |
parent | Implement oar merging (diff) | |
download | opensim-SC_OLD-a4d2a97bc6ead3aeba4e1be419d976925e5ee470.zip opensim-SC_OLD-a4d2a97bc6ead3aeba4e1be419d976925e5ee470.tar.gz opensim-SC_OLD-a4d2a97bc6ead3aeba4e1be419d976925e5ee470.tar.bz2 opensim-SC_OLD-a4d2a97bc6ead3aeba4e1be419d976925e5ee470.tar.xz |
minor: remove some mono compiler warnings, add --merge load oar switch to help information
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Tests/CacheTests.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Framework/Tests/CacheTests.cs b/OpenSim/Framework/Tests/CacheTests.cs index e2afd2a..32c0c95 100644 --- a/OpenSim/Framework/Tests/CacheTests.cs +++ b/OpenSim/Framework/Tests/CacheTests.cs | |||
@@ -78,8 +78,9 @@ namespace OpenSim.Framework.Tests | |||
78 | foo[0] = 1; | 78 | foo[0] = 1; |
79 | cachedItem.Store(foo); | 79 | cachedItem.Store(foo); |
80 | cache.Store(cacheItemUUID.ToString(), cachedItem); | 80 | cache.Store(cacheItemUUID.ToString(), cachedItem); |
81 | 81 | ||
82 | object citem = cache.Get(cacheItemUUID.ToString()); | 82 | cache.Get(cacheItemUUID.ToString()); |
83 | //object citem = cache.Get(cacheItemUUID.ToString()); | ||
83 | //Assert.That(citem == null, "Item should not be in Cache because the expiry time was before now"); | 84 | //Assert.That(citem == null, "Item should not be in Cache because the expiry time was before now"); |
84 | } | 85 | } |
85 | 86 | ||
@@ -94,7 +95,8 @@ namespace OpenSim.Framework.Tests | |||
94 | cachedItem.Store(foo); | 95 | cachedItem.Store(foo); |
95 | cache.Store(cacheItemUUID.ToString(), cachedItem); | 96 | cache.Store(cacheItemUUID.ToString(), cachedItem); |
96 | cache.Invalidate(ImmediateExpiryUUID.ToString()); | 97 | cache.Invalidate(ImmediateExpiryUUID.ToString()); |
97 | object citem = cache.Get(cacheItemUUID.ToString()); | 98 | cache.Get(cacheItemUUID.ToString()); |
99 | //object citem = cache.Get(cacheItemUUID.ToString()); | ||
98 | //Assert.That(citem == null, "Item should not be in Cache because we manually invalidated it"); | 100 | //Assert.That(citem == null, "Item should not be in Cache because we manually invalidated it"); |
99 | } | 101 | } |
100 | 102 | ||