* Apply http://opensimulator.org/mantis/view.php?id=3195

* Access NHibernate Manager as read-only property rather than public field * Thanks Tommil
2009-02-20 14:36:53 +00:00 · 2009-02-20 14:36:53 +00:00 · acf112ac40
parent 01f70de2ea
commit acf112ac40
30 changed files with 73 additions and 30 deletions
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@ -39,7 +39,14 @@ namespace OpenSim.Data.NHibernate
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-        public NHibernateManager manager;
+        private NHibernateManager manager;
+        public NHibernateManager Manager
+        {
+            get
+            {
+                return manager;
+            }
+        }

        override public void Dispose() { }

--- a/OpenSim/Data/NHibernate/NHibernateEstateData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateEstateData.cs
@ -47,7 +47,14 @@ namespace OpenSim.Data.NHibernate

        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-        public NHibernateManager manager;
+        private NHibernateManager manager;
+        public NHibernateManager Manager
+        {
+            get
+            {
+                return manager;
+            }
+        }

        public string Name
        {
--- a/OpenSim/Data/NHibernate/NHibernateGridData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateGridData.cs
@ -45,7 +45,15 @@ namespace OpenSim.Data.NHibernate
    public class NHibernateGridData : GridDataBase
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        public NHibernateManager manager;
+        
+        private NHibernateManager manager;
+        public NHibernateManager Manager
+        {
+            get
+            {
+                return manager;
+            }
+        }

        public override void Initialise()
        {
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@ -40,7 +40,14 @@ namespace OpenSim.Data.NHibernate
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-        public NHibernateManager manager;
+        private NHibernateManager manager;
+        public NHibernateManager Manager
+        {
+            get
+            {
+                return manager;
+            }
+        }

        /// <summary>
        /// The plugin being loaded
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@ -45,7 +45,14 @@ namespace OpenSim.Data.NHibernate
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-        public NHibernateManager manager;
+        private NHibernateManager manager;
+        public NHibernateManager Manager
+        {
+            get
+            {
+                return manager;
+            }
+        }

        public void Initialise(string connect)
        {
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@ -42,7 +42,14 @@ namespace OpenSim.Data.NHibernate
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

-        public NHibernateManager manager;
+        private NHibernateManager manager;
+        public NHibernateManager Manager
+        {
+            get
+            {
+                return manager;
+            }
+        }

        public override void Initialise()
        {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
@ -51,7 +51,7 @@ namespace OpenSim.Data.NHibernate.Tests

                db = new NHibernateAssetData();
                db.Initialise(connect);
-                database = ((NHibernateAssetData)db).manager;
+                database = ((NHibernateAssetData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
@ -51,7 +51,7 @@ namespace OpenSim.Data.NHibernate.Tests

                db = new NHibernateEstateData();
                db.Initialise(connect);
-                database = ((NHibernateEstateData)db).manager;
+                database = ((NHibernateEstateData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateGridData();
                db.Initialise(connect);
-                database = ((NHibernateGridData)db).manager;
+                database = ((NHibernateGridData)db).Manager;
            }
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateInventoryData();
                db.Initialise(connect);
-                database = ((NHibernateInventoryData)db).manager;
+                database = ((NHibernateInventoryData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
@ -51,7 +51,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateRegionData();
                db.Initialise(connect);
-                database = ((NHibernateRegionData)db).manager;
+                database = ((NHibernateRegionData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateUserData();
                db.Initialise(connect);
-                database = ((NHibernateUserData)db).manager;
+                database = ((NHibernateUserData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateAssetData();
                db.Initialise(connect);
-                database = ((NHibernateAssetData)db).manager;
+                database = ((NHibernateAssetData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateGridData();
                db.Initialise(connect);
-                database = ((NHibernateGridData)db).manager;
+                database = ((NHibernateGridData)db).Manager;
            }
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateInventoryData();
                db.Initialise(connect);
-                database = ((NHibernateInventoryData)db).manager;
+                database = ((NHibernateInventoryData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
@ -51,7 +51,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateRegionData();
                db.Initialise(connect);
-                database = ((NHibernateRegionData)db).manager;
+                database = ((NHibernateRegionData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateUserData();
                db.Initialise(connect);
-                database = ((NHibernateUserData)db).manager;
+                database = ((NHibernateUserData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateEstateData();
                db.Initialise(connect);
-                database = ((NHibernateEstateData)db).manager;
+                database = ((NHibernateEstateData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateAssetData();
                db.Initialise(connect);
-                database = ((NHibernateAssetData)db).manager;
+                database = ((NHibernateAssetData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateEstateData();
                db.Initialise(connect);
-                database = ((NHibernateEstateData)db).manager;
+                database = ((NHibernateEstateData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateGridData();
                db.Initialise(connect);
-                database = ((NHibernateGridData)db).manager;
+                database = ((NHibernateGridData)db).Manager;
            }
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateInventoryData();
                db.Initialise(connect);
-                database = ((NHibernateInventoryData)db).manager;
+                database = ((NHibernateInventoryData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateRegionData();
                db.Initialise(connect);
-                database = ((NHibernateRegionData)db).manager;
+                database = ((NHibernateRegionData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
@ -50,7 +50,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateUserData();
                db.Initialise(connect);
-                database = ((NHibernateUserData)db).manager;
+                database = ((NHibernateUserData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
@ -52,7 +52,7 @@ namespace OpenSim.Data.NHibernate.Tests

                db = new NHibernateAssetData();
                db.Initialise(connect);
-                database = ((NHibernateAssetData)db).manager;
+                database = ((NHibernateAssetData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
@ -52,7 +52,7 @@ namespace OpenSim.Data.NHibernate.Tests

                db = new NHibernateEstateData();
                db.Initialise(connect);
-                database = ((NHibernateEstateData)db).manager;
+                database = ((NHibernateEstateData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
@ -51,7 +51,7 @@ namespace OpenSim.Data.NHibernate.Tests
            {
                db = new NHibernateGridData();
                db.Initialise(connect);
-                database = ((NHibernateGridData)db).manager;
+                database = ((NHibernateGridData)db).Manager;
            }
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
@ -52,7 +52,7 @@ namespace OpenSim.Data.NHibernate.Tests

                db = new NHibernateInventoryData();
                db.Initialise(connect);
-                database = ((NHibernateInventoryData)db).manager;
+                database = ((NHibernateInventoryData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
@ -52,7 +52,7 @@ namespace OpenSim.Data.NHibernate.Tests

                db = new NHibernateRegionData();
                db.Initialise(connect);
-                database = ((NHibernateRegionData)db).manager;
+                database = ((NHibernateRegionData)db).Manager;
            } 
            catch (Exception e)
            {
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
@ -52,7 +52,7 @@ namespace OpenSim.Data.NHibernate.Tests
                
                db = new NHibernateUserData();
                db.Initialise(connect);
-                database = ((NHibernateUserData)db).manager;
+                database = ((NHibernateUserData)db).Manager;
            } 
            catch (Exception e)
            {