From acf112ac40602fa1852f49a99fdafef5dfef0b78 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Fri, 20 Feb 2009 14:36:53 +0000
Subject: [PATCH] * Apply http://opensimulator.org/mantis/view.php?id=3195 *
 Access NHibernate Manager as read-only property rather than public field *
 Thanks Tommil

---
 OpenSim/Data/NHibernate/NHibernateAssetData.cs         |  9 ++++++++-
 OpenSim/Data/NHibernate/NHibernateEstateData.cs        |  9 ++++++++-
 OpenSim/Data/NHibernate/NHibernateGridData.cs          | 10 +++++++++-
 OpenSim/Data/NHibernate/NHibernateInventoryData.cs     |  9 ++++++++-
 OpenSim/Data/NHibernate/NHibernateRegionData.cs        |  9 ++++++++-
 OpenSim/Data/NHibernate/NHibernateUserData.cs          |  9 ++++++++-
 .../Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs  |  2 +-
 .../Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs |  2 +-
 .../Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs   |  2 +-
 .../NHibernate/Tests/NHibernateMsSqlInventoryTest.cs   |  2 +-
 .../Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs |  2 +-
 .../Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs   |  2 +-
 .../Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs  |  2 +-
 .../Data/NHibernate/Tests/NHibernateMySQLGridTest.cs   |  2 +-
 .../NHibernate/Tests/NHibernateMySQLInventoryTest.cs   |  2 +-
 .../Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs |  2 +-
 .../Data/NHibernate/Tests/NHibernateMySQLUserTest.cs   |  2 +-
 .../Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs |  2 +-
 .../NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs  |  2 +-
 .../NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs |  2 +-
 .../NHibernate/Tests/NHibernatePostgreSQLGridTest.cs   |  2 +-
 .../Tests/NHibernatePostgreSQLInventoryTest.cs         |  2 +-
 .../NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs |  2 +-
 .../NHibernate/Tests/NHibernatePostgreSQLUserTest.cs   |  2 +-
 .../Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs |  2 +-
 .../NHibernate/Tests/NHibernateSQLiteEstateTest.cs     |  2 +-
 .../Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs  |  2 +-
 .../NHibernate/Tests/NHibernateSQLiteInventoryTest.cs  |  2 +-
 .../NHibernate/Tests/NHibernateSQLiteRegionTest.cs     |  2 +-
 .../Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs  |  2 +-
 30 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 95595db3ab..387d3d4ffe 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 b16f6e14e3..4c5a6e2850 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 b89cefc5ec..1e1d47ec42 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 3e04417cf1..612ab592c8 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 5af3d1ab1c..7a104e43ae 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 8aa4aa2ae8..7a6ef88605 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 82965560a8..ace7e44012 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 ac7343b5a9..a44936bf1c 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 9aa1ba87ad..bb62b6ff03 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 c3c2c93fc8..6fc8abf4ed 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 5cf0a5b4b5..4d0e64d705 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 2b0da74f7d..19fd2486e7 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 96194c62f4..8bec0d3d17 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 60b197c1fa..4c966f56f5 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 8415fdf59d..7f2ee4a9d0 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 89ab928ec6..fa484a3bc5 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 a50df9b847..c316bd47f2 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 7e199c70ee..939f1e9ef4 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 33a36e6404..6f86b0f7cb 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 6458c9829c..c0a76e7180 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 93f1ee1c99..084de852e4 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 afad336ca9..869d24f1a5 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 9967af79da..0e4fc82e39 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 0edfdcbd3e..ffcb1763b9 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 cc4915b68f..1f989490a1 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 88f85b0f10..b51bff2321 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 a358b27b44..b9fe8b9d99 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 297a66157e..f31fc5b6ea 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 f1887364be..d902dfd683 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 d94dac0c9c..78ab00f091 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)
             {