aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-04-23 20:08:24 +0100
committerJustin Clark-Casey (justincc)2010-04-23 20:08:24 +0100
commit1b488c25816fd01e893f64cec1a89f5dbac21104 (patch)
tree32ebb3aab6c7916137ca200551c73439c0db7507
parentminor: correct the assembly information for SQLiteNG (diff)
downloadopensim-SC_OLD-1b488c25816fd01e893f64cec1a89f5dbac21104.zip
opensim-SC_OLD-1b488c25816fd01e893f64cec1a89f5dbac21104.tar.gz
opensim-SC_OLD-1b488c25816fd01e893f64cec1a89f5dbac21104.tar.bz2
opensim-SC_OLD-1b488c25816fd01e893f64cec1a89f5dbac21104.tar.xz
dispose of the DbCommand used to execute migrations after we've finished with it rather than within the loop
disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway
-rw-r--r--OpenSim/Data/Migration.cs3
-rw-r--r--OpenSim/Data/SQLiteNG/SQLiteAssetData.cs2
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 68e25ef..0fb9e78 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -159,8 +159,9 @@ namespace OpenSim.Data
159 UpdateVersion(_type, newversion); 159 UpdateVersion(_type, newversion);
160 } 160 }
161 version = newversion; 161 version = newversion;
162 cmd.Dispose();
163 } 162 }
163
164 cmd.Dispose();
164 } 165 }
165 166
166 // private int MaxVersion() 167 // private int MaxVersion()
diff --git a/OpenSim/Data/SQLiteNG/SQLiteAssetData.cs b/OpenSim/Data/SQLiteNG/SQLiteAssetData.cs
index 636bf86..9b34a21 100644
--- a/OpenSim/Data/SQLiteNG/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLiteNG/SQLiteAssetData.cs
@@ -34,7 +34,7 @@ using Mono.Data.Sqlite;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLiteNG
38{ 38{
39 /// <summary> 39 /// <summary>
40 /// An asset storage interface for the SQLite database system 40 /// An asset storage interface for the SQLite database system