* ARequest changed name to AssetRequest and moved to own file.

* The AssetServerBase is now responsible for dequeueing, the server implementations merely recieves ProcessRequest( AssetRequest req )
* Catchall added around queue processing thread so thread won't abort on exceptions.

1 files changed, 25 insertions, 29 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index e5cceaa..00c2b2a 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -72,37 +72,33 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
 
-        protected override void RunRequests()
+        protected override void ProcessRequest(AssetRequest req)
         {
-            while (true)
+            byte[] idata = null;
+            bool found = false;
+            AssetStorage foundAsset = null;
+            IObjectSet result = db.Query(new AssetUUIDQuery(req.AssetID));
+            if (result.Count > 0)
             {
-                byte[] idata = null;
-                bool found = false;
-                AssetStorage foundAsset = null;
-                ARequest req = _assetRequests.Dequeue();
-                IObjectSet result = db.Query(new AssetUUIDQuery(req.AssetID));
-                if (result.Count > 0)
-                {
-                    foundAsset = (AssetStorage) result.Next();
-                    found = true;
-                }
-
-                AssetBase asset = new AssetBase();
-                if (found)
-                {
-                    asset.FullID = foundAsset.UUID;
-                    asset.Type = foundAsset.Type;
-                    asset.InvType = foundAsset.Type;
-                    asset.Name = foundAsset.Name;
-                    idata = foundAsset.Data;
-                    asset.Data = idata;
-                    _receiver.AssetReceived(asset, req.IsTexture);
-                }
-                else
-                {
-                    //asset.FullID = ;
-                    _receiver.AssetNotFound(req.AssetID);
-                }
+                foundAsset = (AssetStorage)result.Next();
+                found = true;
+            }
+
+            AssetBase asset = new AssetBase();
+            if (found)
+            {
+                asset.FullID = foundAsset.UUID;
+                asset.Type = foundAsset.Type;
+                asset.InvType = foundAsset.Type;
+                asset.Name = foundAsset.Name;
+                idata = foundAsset.Data;
+                asset.Data = idata;
+                _receiver.AssetReceived(asset, req.IsTexture);
+            }
+            else
+            {
+                //asset.FullID = ;
+                _receiver.AssetNotFound(req.AssetID);
             }
         }