From 134f86e8d5c414409631b25b8c6f0ee45fbd8631 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 3 Nov 2016 21:44:39 +1000
Subject: Initial update to OpenSim 0.8.2.1 source code.

---
 .../Handlers/Asset/AssetServerPostHandler.cs       | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs')

diff --git a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
index a006fa8..1c706a7 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
@@ -38,6 +38,7 @@ using System.Xml.Serialization;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework;
+using OpenSim.Framework.ServiceAuth;
 using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Server.Handlers.Asset
@@ -54,35 +55,44 @@ namespace OpenSim.Server.Handlers.Asset
             m_AssetService = service;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        public AssetServerPostHandler(IAssetService service, IServiceAuth auth) :
+            base("POST", "/assets", auth)
+        {
+            m_AssetService = service;
+        }
+
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             AssetBase asset;
-            XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
+            XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
 
             try
             {
                 asset = (AssetBase)xs.Deserialize(request);
             }
-            catch (XmlException)
+            catch (Exception)
             {
                 httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
                 return null;
             }
 
             string[] p = SplitParams(path);
-            if (p.Length > 1)
+            if (p.Length > 0)
             {
-                bool result = m_AssetService.UpdateContent(p[1], asset.Data);
+                string id = p[0];
+                bool result = m_AssetService.UpdateContent(id, asset.Data);
 
                 xs = new XmlSerializer(typeof(bool));
                 return ServerUtils.SerializeResult(xs, result);
             }
+            else
+            {
+                string id = m_AssetService.Store(asset);
 
-            string id = m_AssetService.Store(asset);
-
-            xs = new XmlSerializer(typeof(string));
-            return ServerUtils.SerializeResult(xs, id);
+                xs = new XmlSerializer(typeof(string));
+                return ServerUtils.SerializeResult(xs, id);
+            }
         }
     }
 }
-- 
cgit v1.1