* 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, 21 insertions, 4 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index e117c93..659b9c9 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications.Cache
     public abstract class AssetServerBase : IAssetServer
     {
         protected IAssetReceiver _receiver;
-        protected BlockingQueue<ARequest> _assetRequests;
+        protected BlockingQueue<AssetRequest> _assetRequests;
         protected Thread _localAssetServerThread;
         protected IAssetProvider m_assetProviderPlugin;
         protected object syncLock = new object();
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Communications.Cache
         protected abstract void StoreAsset(AssetBase asset);
         protected abstract void CommitAssets();
 
-        protected abstract void RunRequests();
+        protected abstract void ProcessRequest(AssetRequest req);
 
         public void LoadDefaultAssets()
         {
@@ -64,13 +64,30 @@ namespace OpenSim.Framework.Communications.Cache
         public AssetServerBase()
         {
             MainLog.Instance.Verbose("ASSETSERVER", "Starting asset storage system");
-            _assetRequests = new BlockingQueue<ARequest>();
+            _assetRequests = new BlockingQueue<AssetRequest>();
 
             _localAssetServerThread = new Thread(RunRequests);
             _localAssetServerThread.IsBackground = true;
             _localAssetServerThread.Start();
         }
 
+        private void RunRequests()
+        {
+            while (true) // Since it's a 'blocking queue'
+            {
+                try
+                {
+                    AssetRequest req = _assetRequests.Dequeue();
+
+                    ProcessRequest(req);
+                }
+                catch(Exception e)
+                {
+                    MainLog.Instance.Error("ASSETSERVER", e.Message );
+                }
+            }
+        }
+
         public void LoadAsset(AssetBase info, bool image, string filename)
         {
             //should request Asset from storage manager
@@ -97,7 +114,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public void RequestAsset(LLUUID assetID, bool isTexture)
         {
-            ARequest req = new ARequest();
+            AssetRequest req = new AssetRequest();
             req.AssetID = assetID;
             req.IsTexture = isTexture;
             MainLog.Instance.Verbose("ASSET","Adding {0} to request queue", assetID);