aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-06-05 16:14:22 +0000
committerJustin Clarke Casey2009-06-05 16:14:22 +0000
commit593942b195cb5b29b47bd077cf53c32699fd2ff8 (patch)
treec2fc437583fd03468446f3680de41336bf62e8b3 /OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs
parent* Add oar saving timeout (diff)
downloadopensim-SC_OLD-593942b195cb5b29b47bd077cf53c32699fd2ff8.zip
opensim-SC_OLD-593942b195cb5b29b47bd077cf53c32699fd2ff8.tar.gz
opensim-SC_OLD-593942b195cb5b29b47bd077cf53c32699fd2ff8.tar.bz2
opensim-SC_OLD-593942b195cb5b29b47bd077cf53c32699fd2ff8.tar.xz
* 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
Diffstat (limited to 'OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs')
-rw-r--r--OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs8
1 files changed, 5 insertions, 3 deletions
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
64 64
65 if (!UUID.TryParse(p[0], out assetID)) 65 if (!UUID.TryParse(p[0], out assetID))
66 { 66 {
67 m_log.InfoFormat( 67 m_log.DebugFormat(
68 "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); 68 "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
69 return result; 69 return result;
70 } 70 }
@@ -91,12 +91,14 @@ namespace OpenSim.Framework.Servers
91 } 91 }
92 else 92 else
93 { 93 {
94 m_log.DebugFormat("[REST]: GET:/asset failed to find {0}", assetID);
95
96 httpResponse.StatusCode = (int)HttpStatusCode.NotFound;
97
94 if (StatsManager.AssetStats != null) 98 if (StatsManager.AssetStats != null)
95 { 99 {
96 StatsManager.AssetStats.AddNotFoundRequest(); 100 StatsManager.AssetStats.AddNotFoundRequest();
97 } 101 }
98
99 m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
100 } 102 }
101 } 103 }
102 104