From 593942b195cb5b29b47bd077cf53c32699fd2ff8 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 5 Jun 2009 16:14:22 +0000
Subject: * Fix problem where known missing assets would stop save oar ever
 completing

* Issue was that region server was silently dropping an XmlException caused by trying to deserialize the blank asset service response
* So make asset service return http status NOT FOUND rather than OK in accordance with REST
* and interpret this correctly in the async response so that a null object is sent back
* This means that this fix won't be active until both region simulator and server reach this revision


---
 OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 14804a4..fbb9a00 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -228,12 +228,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
                                                            
                     if (asset != null)
-                    {                
+                    {
+//                        m_log.DebugFormat("[ARCHIVER]: Recording asset {0} as found", id);
                         m_foundAssetUuids.Add(asset.FullID);
                         m_assetsArchiver.WriteAsset(asset);
                     }
                     else
                     {
+//                        m_log.DebugFormat("[ARCHIVER]: Recording asset {0} as not found", id);
                         m_notFoundAssetUuids.Add(new UUID(id));
                     }
         
-- 
cgit v1.1