diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 1eb641d..89e9593 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -154,6 +154,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
154 | 154 | ||
155 | protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args) | 155 | protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args) |
156 | { | 156 | { |
157 | bool close = true; | ||
158 | |||
157 | try | 159 | try |
158 | { | 160 | { |
159 | lock (this) | 161 | lock (this) |
@@ -161,7 +163,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
161 | // Take care of the possibilty that this thread started but was paused just outside the lock before | 163 | // Take care of the possibilty that this thread started but was paused just outside the lock before |
162 | // the final request came in (assuming that such a thing is possible) | 164 | // the final request came in (assuming that such a thing is possible) |
163 | if (m_requestState == RequestState.Completed) | 165 | if (m_requestState == RequestState.Completed) |
166 | { | ||
167 | close = false; | ||
164 | return; | 168 | return; |
169 | } | ||
165 | 170 | ||
166 | m_requestState = RequestState.Aborted; | 171 | m_requestState = RequestState.Aborted; |
167 | } | 172 | } |
@@ -208,7 +213,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
208 | } | 213 | } |
209 | finally | 214 | finally |
210 | { | 215 | { |
211 | m_assetsArchiver.ForceClose(); | 216 | if (close) |
217 | m_assetsArchiver.ForceClose(); | ||
212 | } | 218 | } |
213 | } | 219 | } |
214 | 220 | ||
@@ -242,11 +248,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
242 | 248 | ||
243 | m_requestCallbackTimer.Stop(); | 249 | m_requestCallbackTimer.Stop(); |
244 | 250 | ||
245 | if (m_requestState == RequestState.Aborted) | 251 | if ((m_requestState == RequestState.Aborted) || (m_requestState == RequestState.Completed)) |
246 | { | 252 | { |
247 | m_log.WarnFormat( | 253 | m_log.WarnFormat( |
248 | "[ARCHIVER]: Received information about asset {0} after archive save abortion. Ignoring.", | 254 | "[ARCHIVER]: Received information about asset {0} while in state {1}. Ignoring.", |
249 | id); | 255 | id, m_requestState); |
250 | 256 | ||
251 | return; | 257 | return; |
252 | } | 258 | } |
@@ -264,7 +270,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
264 | m_notFoundAssetUuids.Add(new UUID(id)); | 270 | m_notFoundAssetUuids.Add(new UUID(id)); |
265 | } | 271 | } |
266 | 272 | ||
267 | if (m_foundAssetUuids.Count + m_notFoundAssetUuids.Count == m_repliesRequired) | 273 | if (m_foundAssetUuids.Count + m_notFoundAssetUuids.Count >= m_repliesRequired) |
268 | { | 274 | { |
269 | m_requestState = RequestState.Completed; | 275 | m_requestState = RequestState.Completed; |
270 | 276 | ||