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

* Access NHibernate Manager as read-only property rather than public field
* Thanks Tommil

30 files changed, 73 insertions, 30 deletions

diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 95595db..387d3d4 100644
--- 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() { }
 
diff --git a/OpenSim/Data/NHibernate/NHibernateEstateData.cs b/OpenSim/Data/NHibernate/NHibernateEstateData.cs
index b16f6e1..4c5a6e2 100644
--- 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
         {
diff --git a/OpenSim/Data/NHibernate/NHibernateGridData.cs b/OpenSim/Data/NHibernate/NHibernateGridData.cs
index b89cefc..1e1d47e 100644
--- 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()
         {
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 3e04417..612ab59 100644
--- 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
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 5af3d1a..7a104e4 100644
--- 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)
         {
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 8aa4aa2..7a6ef88 100644
--- 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()
         {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
index 8296556..ace7e44 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
index ac7343b..a44936b 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
index 9aa1ba8..bb62b6f 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
index c3c2c93..6fc8abf 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
index 5cf0a5b..4d0e64d 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
index 2b0da74..19fd248 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
index 96194c6..8bec0d3 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
index 60b197c..4c966f5 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
index 8415fdf..7f2ee4a 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
index 89ab928..fa484a3 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
index a50df9b..c316bd4 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
index 7e199c7..939f1e9 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
index 33a36e6..6f86b0f 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
index 6458c98..c0a76e7 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
index 93f1ee1..084de85 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
index afad336..869d24f 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
index 9967af7..0e4fc82 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
index 0edfdcb..ffcb176 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
index cc4915b..1f98949 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
index 88f85b0..b51bff2 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
index a358b27..b9fe8b9 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
index 297a661..f31fc5b 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
index f188736..d902dfd 100644
--- 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)
             {
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
index d94dac0..78ab00f 100644
--- 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)
             {