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/Framework/Servers/BaseGetAssetStreamHandler.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs')

diff --git a/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs b/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs
index 83a5676..8372ae7 100644
--- a/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Servers
                 
                 if (!UUID.TryParse(p[0], out assetID))
                 {
-                    m_log.InfoFormat(
+                    m_log.DebugFormat(
                         "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
                     return result;
                 }
@@ -91,12 +91,14 @@ namespace OpenSim.Framework.Servers
                 }
                 else
                 {
+                    m_log.DebugFormat("[REST]: GET:/asset failed to find {0}", assetID);
+                    
+                    httpResponse.StatusCode = (int)HttpStatusCode.NotFound;
+                    
                     if (StatsManager.AssetStats != null)
                     {
                         StatsManager.AssetStats.AddNotFoundRequest();
                     }
-
-                    m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
                 }
             }
 
-- 
cgit v1.1