diff options
| author | Sean Dague | 2008-04-24 15:52:22 +0000 |
|---|---|---|
| committer | Sean Dague | 2008-04-24 15:52:22 +0000 |
| commit | 03c7055902d98a7cfe16b6319e1adde91a5ca9c6 (patch) | |
| tree | 7d8a536245195ab7c8b5001dc0ba446dbfd99cdd | |
| parent | in theory, let you pass the mysql connection string into the (diff) | |
| download | opensim-SC-03c7055902d98a7cfe16b6319e1adde91a5ca9c6.zip opensim-SC-03c7055902d98a7cfe16b6319e1adde91a5ca9c6.tar.gz opensim-SC-03c7055902d98a7cfe16b6319e1adde91a5ca9c6.tar.bz2 opensim-SC-03c7055902d98a7cfe16b6319e1adde91a5ca9c6.tar.xz | |
do a max of 3 splits when first processing the nhibernate connect
strings so the ; in the db connect strings pass to the native
drivers correctly
| -rw-r--r-- | OpenSim/Data/NHibernate/NHibernateAssetData.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index 740868b..c0dd322 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs | |||
| @@ -59,7 +59,7 @@ namespace OpenSim.Data.NHibernate | |||
| 59 | { | 59 | { |
| 60 | // Split out the dialect, driver, and connect string | 60 | // Split out the dialect, driver, and connect string |
| 61 | char[] split = {';'}; | 61 | char[] split = {';'}; |
| 62 | string[] parts = connect.Split(split); | 62 | string[] parts = connect.Split(split, 3); |
| 63 | if (parts.Length != 3) { | 63 | if (parts.Length != 3) { |
| 64 | // TODO: make this a real exception type | 64 | // TODO: make this a real exception type |
| 65 | throw new Exception("Malformed Inventory connection string '" + connect + "'"); | 65 | throw new Exception("Malformed Inventory connection string '" + connect + "'"); |
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index 08d9dc1..77b9b01 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs | |||
| @@ -56,7 +56,7 @@ namespace OpenSim.Data.NHibernate | |||
| 56 | { | 56 | { |
| 57 | // Split out the dialect, driver, and connect string | 57 | // Split out the dialect, driver, and connect string |
| 58 | char[] split = {';'}; | 58 | char[] split = {';'}; |
| 59 | string[] parts = connect.Split(split); | 59 | string[] parts = connect.Split(split, 3); |
| 60 | if (parts.Length != 3) { | 60 | if (parts.Length != 3) { |
| 61 | // TODO: make this a real exception type | 61 | // TODO: make this a real exception type |
| 62 | throw new Exception("Malformed Inventory connection string '" + connect + "'"); | 62 | throw new Exception("Malformed Inventory connection string '" + connect + "'"); |