diff options
author | Diva Canto | 2010-02-20 21:24:18 -0800 |
---|---|---|
committer | Diva Canto | 2010-02-20 21:24:18 -0800 |
commit | 56fb7821ad021879d005da5ba65901c29c10de7f (patch) | |
tree | 9d845f2b4f34414677878118c70b3b98bdcffe8b /OpenSim | |
parent | Fix SQLite locking and make it more fascist for now (diff) | |
download | opensim-SC_OLD-56fb7821ad021879d005da5ba65901c29c10de7f.zip opensim-SC_OLD-56fb7821ad021879d005da5ba65901c29c10de7f.tar.gz opensim-SC_OLD-56fb7821ad021879d005da5ba65901c29c10de7f.tar.bz2 opensim-SC_OLD-56fb7821ad021879d005da5ba65901c29c10de7f.tar.xz |
Restored mising m_Connection.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAuthenticationData.cs | 10 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteFramework.cs | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs index 7dab6bf..d71c7eb 100644 --- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs +++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs | |||
@@ -57,8 +57,8 @@ namespace OpenSim.Data.SQLite | |||
57 | 57 | ||
58 | using (SqliteConnection dbcon = new SqliteConnection(m_connectionString)) | 58 | using (SqliteConnection dbcon = new SqliteConnection(m_connectionString)) |
59 | { | 59 | { |
60 | dbcon.Open(); | 60 | //dbcon.Open(); |
61 | Migration m = new Migration(dbcon, GetType().Assembly, "AuthStore"); | 61 | Migration m = new Migration(m_Connection, GetType().Assembly, "AuthStore"); |
62 | m.Update(); | 62 | m.Update(); |
63 | } | 63 | } |
64 | 64 | ||
@@ -149,8 +149,9 @@ namespace OpenSim.Data.SQLite | |||
149 | return false; | 149 | return false; |
150 | } | 150 | } |
151 | } | 151 | } |
152 | catch | 152 | catch (Exception e) |
153 | { | 153 | { |
154 | Console.WriteLine(e.ToString()); | ||
154 | cmd.Dispose(); | 155 | cmd.Dispose(); |
155 | return false; | 156 | return false; |
156 | } | 157 | } |
@@ -174,8 +175,9 @@ namespace OpenSim.Data.SQLite | |||
174 | return false; | 175 | return false; |
175 | } | 176 | } |
176 | } | 177 | } |
177 | catch | 178 | catch (Exception e) |
178 | { | 179 | { |
180 | Console.WriteLine(e.ToString()); | ||
179 | cmd.Dispose(); | 181 | cmd.Dispose(); |
180 | return false; | 182 | return false; |
181 | } | 183 | } |
diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs index 96764f3..54b104b 100644 --- a/OpenSim/Data/SQLite/SQLiteFramework.cs +++ b/OpenSim/Data/SQLite/SQLiteFramework.cs | |||
@@ -42,6 +42,7 @@ namespace OpenSim.Data.SQLite | |||
42 | { | 42 | { |
43 | protected Object m_lockObject = new Object(); | 43 | protected Object m_lockObject = new Object(); |
44 | 44 | ||
45 | protected static SqliteConnection m_Connection; | ||
45 | protected SQLiteFramework(string connectionString) | 46 | protected SQLiteFramework(string connectionString) |
46 | { | 47 | { |
47 | } | 48 | } |