From 1b488c25816fd01e893f64cec1a89f5dbac21104 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 23 Apr 2010 20:08:24 +0100 Subject: [PATCH] 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 --- OpenSim/Data/Migration.cs | 3 ++- OpenSim/Data/SQLiteNG/SQLiteAssetData.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs index 68e25ef0aa..0fb9e783bd 100644 --- a/OpenSim/Data/Migration.cs +++ b/OpenSim/Data/Migration.cs @@ -159,8 +159,9 @@ namespace OpenSim.Data UpdateVersion(_type, newversion); } version = newversion; - cmd.Dispose(); } + + cmd.Dispose(); } // private int MaxVersion() diff --git a/OpenSim/Data/SQLiteNG/SQLiteAssetData.cs b/OpenSim/Data/SQLiteNG/SQLiteAssetData.cs index 636bf8645b..9b34a21592 100644 --- a/OpenSim/Data/SQLiteNG/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLiteNG/SQLiteAssetData.cs @@ -34,7 +34,7 @@ using Mono.Data.Sqlite; using OpenMetaverse; using OpenSim.Framework; -namespace OpenSim.Data.SQLite +namespace OpenSim.Data.SQLiteNG { /// /// An asset storage interface for the SQLite database system