From 656c72befc1d1b3d2aa29c09dd8f75ee2ef5ef8a Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 19 Oct 2007 08:57:30 +0000
Subject: * some more refactoring + bugfix

---
 .../Framework/Communications/Cache/AssetServer.cs  | 67 +++++++++++-----------
 1 file changed, 32 insertions(+), 35 deletions(-)

(limited to 'OpenSim/Framework/Communications/Cache/AssetServer.cs')

diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs
index a374df2..b17f65a 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs
@@ -1,29 +1,29 @@
-/*
-* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
 */
 using System;
 using System.Collections.Generic;
@@ -57,11 +57,6 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 SetUpAssetDatabase();
             }
-
-            this._localAssetServerThread = new Thread(new ThreadStart(RunRequests));
-            this._localAssetServerThread.IsBackground = true;
-            this._localAssetServerThread.Start();
-
         }
 
         public void CreateAndCommitAsset(AssetBase asset)
@@ -76,6 +71,8 @@ namespace OpenSim.Framework.Communications.Cache
 
         override public void Close()
         {
+            base.Close();
+
             if (db != null)
             {
                 MainLog.Instance.Verbose("Closing local asset server database");
@@ -83,7 +80,7 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
 
-        private void RunRequests()
+        override  protected void RunRequests()
         {
             while (true)
             {
@@ -135,12 +132,12 @@ namespace OpenSim.Framework.Communications.Cache
             db.Commit();
         }
 
-        private void SetUpAssetDatabase()
+        protected virtual void SetUpAssetDatabase()
         {
             MainLog.Instance.Verbose("LOCAL ASSET SERVER", "Setting up asset database");
 
-            ForEachDefaultAsset(this, StoreAsset);
-            ForEachXmlAsset(this, StoreAsset);
+            ForEachDefaultAsset(StoreAsset);
+            ForEachXmlAsset(StoreAsset);
         }
     }
 
-- 
cgit v1.1