diff options
author | Justin Clark-Casey (justincc) | 2010-11-20 02:59:21 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-11-20 02:59:21 +0000 |
commit | d7bca3d8e8f62e938da9fada95f7336710900f4a (patch) | |
tree | f55f7389317f1a7cb518d3e94b645d12bbcf7eb6 /OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |
parent | correct build break. for some reason, xbuild didn't rebuild test dlls (diff) | |
download | opensim-SC_OLD-d7bca3d8e8f62e938da9fada95f7336710900f4a.zip opensim-SC_OLD-d7bca3d8e8f62e938da9fada95f7336710900f4a.tar.gz opensim-SC_OLD-d7bca3d8e8f62e938da9fada95f7336710900f4a.tar.bz2 opensim-SC_OLD-d7bca3d8e8f62e938da9fada95f7336710900f4a.tar.xz |
Fix unit tests and save problems
(note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly).
Firstly, if you can save a version 1.0 OAR then you can load it too.
Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 3eb797b..b987b5a 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -192,9 +192,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
192 | new AssetsArchiver(archiveWriter), assetUuids, | 192 | new AssetsArchiver(archiveWriter), assetUuids, |
193 | m_scene.AssetService, awre.ReceivedAllAssets).Execute(); | 193 | m_scene.AssetService, awre.ReceivedAllAssets).Execute(); |
194 | } | 194 | } |
195 | finally | 195 | catch (Exception) |
196 | { | 196 | { |
197 | m_saveStream.Close(); | 197 | m_saveStream.Close(); |
198 | throw; | ||
198 | } | 199 | } |
199 | } | 200 | } |
200 | 201 | ||