diff options
author | Justin Clark-Casey (justincc) | 2012-05-07 20:01:17 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-07 20:01:17 +0100 |
commit | 5d1d47e1f9327c29ba26d231c8d18680d06cb1d9 (patch) | |
tree | e8ea043822e96172526b77bda40f488926016c30 /OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |
parent | Log the full exception when errors occur in BaseHttpServer (diff) | |
download | opensim-SC_OLD-5d1d47e1f9327c29ba26d231c8d18680d06cb1d9.zip opensim-SC_OLD-5d1d47e1f9327c29ba26d231c8d18680d06cb1d9.tar.gz opensim-SC_OLD-5d1d47e1f9327c29ba26d231c8d18680d06cb1d9.tar.bz2 opensim-SC_OLD-5d1d47e1f9327c29ba26d231c8d18680d06cb1d9.tar.xz |
Revert "Better error handling if Load OAR or Save OAR fail"
This reverts commit 65c88b2ff4e2616fa5c1d4c5e75298ed1eb1c0d8.
Yet again I accidentally committed something whilst evaluating it.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 384d81b..eabe46e 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -124,9 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
124 | if (options.ContainsKey("noassets") && (bool)options["noassets"]) | 124 | if (options.ContainsKey("noassets") && (bool)options["noassets"]) |
125 | SaveAssets = false; | 125 | SaveAssets = false; |
126 | 126 | ||
127 | // Whether someone else (i.e., ReceivedAllAssets()) is responsible for calling TriggerOarFileSaved() when we're done | ||
128 | bool eventHandled = false; | ||
129 | |||
130 | try | 127 | try |
131 | { | 128 | { |
132 | Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>(); | 129 | Dictionary<UUID, AssetType> assetUuids = new Dictionary<UUID, AssetType>(); |
@@ -233,21 +230,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
233 | m_scene.RegionInfo.ScopeID, options, awre.ReceivedAllAssets); | 230 | m_scene.RegionInfo.ScopeID, options, awre.ReceivedAllAssets); |
234 | 231 | ||
235 | Util.FireAndForget(o => ar.Execute()); | 232 | Util.FireAndForget(o => ar.Execute()); |
236 | eventHandled = true; | ||
237 | } | 233 | } |
238 | else | 234 | else |
239 | { | 235 | { |
240 | awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>()); | 236 | awre.ReceivedAllAssets(new List<UUID>(), new List<UUID>()); |
241 | eventHandled = true; | ||
242 | } | 237 | } |
243 | } | 238 | } |
244 | catch (Exception e) | 239 | catch (Exception) |
245 | { | 240 | { |
246 | m_saveStream.Close(); | 241 | m_saveStream.Close(); |
247 | |||
248 | if (!eventHandled) | ||
249 | m_scene.EventManager.TriggerOarFileSaved(m_requestId, e.ToString()); | ||
250 | |||
251 | throw; | 242 | throw; |
252 | } | 243 | } |
253 | } | 244 | } |