diff options
author | Justin Clarke Casey | 2009-02-20 14:36:53 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-20 14:36:53 +0000 |
commit | acf112ac40602fa1852f49a99fdafef5dfef0b78 (patch) | |
tree | df6503eb5ca6f466de23034c506a906409be9b7f | |
parent | * Consistently lock part.TaskInventory as pointed out in http://opensimulator... (diff) | |
download | opensim-SC-acf112ac40602fa1852f49a99fdafef5dfef0b78.zip opensim-SC-acf112ac40602fa1852f49a99fdafef5dfef0b78.tar.gz opensim-SC-acf112ac40602fa1852f49a99fdafef5dfef0b78.tar.bz2 opensim-SC-acf112ac40602fa1852f49a99fdafef5dfef0b78.tar.xz |
* 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 | |||
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
42 | public NHibernateManager manager; | 42 | private NHibernateManager manager; |
43 | public NHibernateManager Manager | ||
44 | { | ||
45 | get | ||
46 | { | ||
47 | return manager; | ||
48 | } | ||
49 | } | ||
43 | 50 | ||
44 | override public void Dispose() { } | 51 | override public void Dispose() { } |
45 | 52 | ||
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 | |||
47 | 47 | ||
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | public NHibernateManager manager; | 50 | private NHibernateManager manager; |
51 | public NHibernateManager Manager | ||
52 | { | ||
53 | get | ||
54 | { | ||
55 | return manager; | ||
56 | } | ||
57 | } | ||
51 | 58 | ||
52 | public string Name | 59 | public string Name |
53 | { | 60 | { |
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 | |||
45 | public class NHibernateGridData : GridDataBase | 45 | public class NHibernateGridData : GridDataBase |
46 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | public NHibernateManager manager; | 48 | |
49 | private NHibernateManager manager; | ||
50 | public NHibernateManager Manager | ||
51 | { | ||
52 | get | ||
53 | { | ||
54 | return manager; | ||
55 | } | ||
56 | } | ||
49 | 57 | ||
50 | public override void Initialise() | 58 | public override void Initialise() |
51 | { | 59 | { |
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 | |||
40 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | public NHibernateManager manager; | 43 | private NHibernateManager manager; |
44 | public NHibernateManager Manager | ||
45 | { | ||
46 | get | ||
47 | { | ||
48 | return manager; | ||
49 | } | ||
50 | } | ||
44 | 51 | ||
45 | /// <summary> | 52 | /// <summary> |
46 | /// The plugin being loaded | 53 | /// 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 | |||
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | public NHibernateManager manager; | 48 | private NHibernateManager manager; |
49 | public NHibernateManager Manager | ||
50 | { | ||
51 | get | ||
52 | { | ||
53 | return manager; | ||
54 | } | ||
55 | } | ||
49 | 56 | ||
50 | public void Initialise(string connect) | 57 | public void Initialise(string connect) |
51 | { | 58 | { |
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 | |||
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | public NHibernateManager manager; | 45 | private NHibernateManager manager; |
46 | public NHibernateManager Manager | ||
47 | { | ||
48 | get | ||
49 | { | ||
50 | return manager; | ||
51 | } | ||
52 | } | ||
46 | 53 | ||
47 | public override void Initialise() | 54 | public override void Initialise() |
48 | { | 55 | { |
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 | |||
51 | 51 | ||
52 | db = new NHibernateAssetData(); | 52 | db = new NHibernateAssetData(); |
53 | db.Initialise(connect); | 53 | db.Initialise(connect); |
54 | database = ((NHibernateAssetData)db).manager; | 54 | database = ((NHibernateAssetData)db).Manager; |
55 | } | 55 | } |
56 | catch (Exception e) | 56 | catch (Exception e) |
57 | { | 57 | { |
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 | |||
51 | 51 | ||
52 | db = new NHibernateEstateData(); | 52 | db = new NHibernateEstateData(); |
53 | db.Initialise(connect); | 53 | db.Initialise(connect); |
54 | database = ((NHibernateEstateData)db).manager; | 54 | database = ((NHibernateEstateData)db).Manager; |
55 | } | 55 | } |
56 | catch (Exception e) | 56 | catch (Exception e) |
57 | { | 57 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateGridData(); | 51 | db = new NHibernateGridData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateGridData)db).manager; | 53 | database = ((NHibernateGridData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateInventoryData(); | 51 | db = new NHibernateInventoryData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateInventoryData)db).manager; | 53 | database = ((NHibernateInventoryData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
51 | { | 51 | { |
52 | db = new NHibernateRegionData(); | 52 | db = new NHibernateRegionData(); |
53 | db.Initialise(connect); | 53 | db.Initialise(connect); |
54 | database = ((NHibernateRegionData)db).manager; | 54 | database = ((NHibernateRegionData)db).Manager; |
55 | } | 55 | } |
56 | catch (Exception e) | 56 | catch (Exception e) |
57 | { | 57 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateUserData(); | 51 | db = new NHibernateUserData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateUserData)db).manager; | 53 | database = ((NHibernateUserData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateAssetData(); | 51 | db = new NHibernateAssetData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateAssetData)db).manager; | 53 | database = ((NHibernateAssetData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateGridData(); | 51 | db = new NHibernateGridData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateGridData)db).manager; | 53 | database = ((NHibernateGridData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateInventoryData(); | 51 | db = new NHibernateInventoryData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateInventoryData)db).manager; | 53 | database = ((NHibernateInventoryData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
51 | { | 51 | { |
52 | db = new NHibernateRegionData(); | 52 | db = new NHibernateRegionData(); |
53 | db.Initialise(connect); | 53 | db.Initialise(connect); |
54 | database = ((NHibernateRegionData)db).manager; | 54 | database = ((NHibernateRegionData)db).Manager; |
55 | } | 55 | } |
56 | catch (Exception e) | 56 | catch (Exception e) |
57 | { | 57 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateUserData(); | 51 | db = new NHibernateUserData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateUserData)db).manager; | 53 | database = ((NHibernateUserData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateEstateData(); | 51 | db = new NHibernateEstateData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateEstateData)db).manager; | 53 | database = ((NHibernateEstateData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateAssetData(); | 51 | db = new NHibernateAssetData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateAssetData)db).manager; | 53 | database = ((NHibernateAssetData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateEstateData(); | 51 | db = new NHibernateEstateData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateEstateData)db).manager; | 53 | database = ((NHibernateEstateData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateGridData(); | 51 | db = new NHibernateGridData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateGridData)db).manager; | 53 | database = ((NHibernateGridData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateInventoryData(); | 51 | db = new NHibernateInventoryData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateInventoryData)db).manager; | 53 | database = ((NHibernateInventoryData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateRegionData(); | 51 | db = new NHibernateRegionData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateRegionData)db).manager; | 53 | database = ((NHibernateRegionData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
50 | { | 50 | { |
51 | db = new NHibernateUserData(); | 51 | db = new NHibernateUserData(); |
52 | db.Initialise(connect); | 52 | db.Initialise(connect); |
53 | database = ((NHibernateUserData)db).manager; | 53 | database = ((NHibernateUserData)db).Manager; |
54 | } | 54 | } |
55 | catch (Exception e) | 55 | catch (Exception e) |
56 | { | 56 | { |
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 | |||
52 | 52 | ||
53 | db = new NHibernateAssetData(); | 53 | db = new NHibernateAssetData(); |
54 | db.Initialise(connect); | 54 | db.Initialise(connect); |
55 | database = ((NHibernateAssetData)db).manager; | 55 | database = ((NHibernateAssetData)db).Manager; |
56 | } | 56 | } |
57 | catch (Exception e) | 57 | catch (Exception e) |
58 | { | 58 | { |
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 | |||
52 | 52 | ||
53 | db = new NHibernateEstateData(); | 53 | db = new NHibernateEstateData(); |
54 | db.Initialise(connect); | 54 | db.Initialise(connect); |
55 | database = ((NHibernateEstateData)db).manager; | 55 | database = ((NHibernateEstateData)db).Manager; |
56 | } | 56 | } |
57 | catch (Exception e) | 57 | catch (Exception e) |
58 | { | 58 | { |
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 | |||
51 | { | 51 | { |
52 | db = new NHibernateGridData(); | 52 | db = new NHibernateGridData(); |
53 | db.Initialise(connect); | 53 | db.Initialise(connect); |
54 | database = ((NHibernateGridData)db).manager; | 54 | database = ((NHibernateGridData)db).Manager; |
55 | } | 55 | } |
56 | catch (Exception e) | 56 | catch (Exception e) |
57 | { | 57 | { |
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 | |||
52 | 52 | ||
53 | db = new NHibernateInventoryData(); | 53 | db = new NHibernateInventoryData(); |
54 | db.Initialise(connect); | 54 | db.Initialise(connect); |
55 | database = ((NHibernateInventoryData)db).manager; | 55 | database = ((NHibernateInventoryData)db).Manager; |
56 | } | 56 | } |
57 | catch (Exception e) | 57 | catch (Exception e) |
58 | { | 58 | { |
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 | |||
52 | 52 | ||
53 | db = new NHibernateRegionData(); | 53 | db = new NHibernateRegionData(); |
54 | db.Initialise(connect); | 54 | db.Initialise(connect); |
55 | database = ((NHibernateRegionData)db).manager; | 55 | database = ((NHibernateRegionData)db).Manager; |
56 | } | 56 | } |
57 | catch (Exception e) | 57 | catch (Exception e) |
58 | { | 58 | { |
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 | |||
52 | 52 | ||
53 | db = new NHibernateUserData(); | 53 | db = new NHibernateUserData(); |
54 | db.Initialise(connect); | 54 | db.Initialise(connect); |
55 | database = ((NHibernateUserData)db).manager; | 55 | database = ((NHibernateUserData)db).Manager; |
56 | } | 56 | } |
57 | catch (Exception e) | 57 | catch (Exception e) |
58 | { | 58 | { |