diff options
author | Homer Horwitz | 2008-09-18 20:15:04 +0000 |
---|---|---|
committer | Homer Horwitz | 2008-09-18 20:15:04 +0000 |
commit | e2564f25639fc873fd95fb14118453659a3504c3 (patch) | |
tree | cf72b07729e75e1b5a583f46929eb0c6e27cd638 | |
parent | - Add Dispose method to IRegionDataStore (diff) | |
download | opensim-SC-e2564f25639fc873fd95fb14118453659a3504c3.zip opensim-SC-e2564f25639fc873fd95fb14118453659a3504c3.tar.gz opensim-SC-e2564f25639fc873fd95fb14118453659a3504c3.tar.bz2 opensim-SC-e2564f25639fc873fd95fb14118453659a3504c3.tar.xz |
Add a db.Dispose before calling Delete on the SQLite database.
On Windows, you are not able to delete a file while there is
still a handle to it open.
-rw-r--r-- | OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs | 1 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | 1 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs | 3 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs index b399543..89bb2ae 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs | |||
@@ -56,6 +56,7 @@ namespace OpenSim.Data.SQLite.Tests | |||
56 | [TestFixtureTearDown] | 56 | [TestFixtureTearDown] |
57 | public void Cleanup() | 57 | public void Cleanup() |
58 | { | 58 | { |
59 | db.Dispose(); | ||
59 | System.IO.File.Delete(file); | 60 | System.IO.File.Delete(file); |
60 | } | 61 | } |
61 | } | 62 | } |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs index 14c4f56..998229f 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs | |||
@@ -64,6 +64,7 @@ namespace OpenSim.Data.SQLite.Tests | |||
64 | [TestFixtureTearDown] | 64 | [TestFixtureTearDown] |
65 | public void Cleanup() | 65 | public void Cleanup() |
66 | { | 66 | { |
67 | db.Dispose(); | ||
67 | System.IO.File.Delete(file); | 68 | System.IO.File.Delete(file); |
68 | } | 69 | } |
69 | } | 70 | } |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs index 6727b87..e827638 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs | |||
@@ -55,7 +55,8 @@ namespace OpenSim.Data.SQLite.Tests | |||
55 | [TestFixtureTearDown] | 55 | [TestFixtureTearDown] |
56 | public void Cleanup() | 56 | public void Cleanup() |
57 | { | 57 | { |
58 | // System.IO.File.Delete(file); | 58 | db.Dispose(); |
59 | System.IO.File.Delete(file); | ||
59 | } | 60 | } |
60 | } | 61 | } |
61 | } \ No newline at end of file | 62 | } \ No newline at end of file |
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs index d4aaf99..d9e2867 100644 --- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs +++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs | |||
@@ -55,6 +55,7 @@ namespace OpenSim.Data.SQLite.Tests | |||
55 | [TestFixtureTearDown] | 55 | [TestFixtureTearDown] |
56 | public void Cleanup() | 56 | public void Cleanup() |
57 | { | 57 | { |
58 | db.Dispose(); | ||
58 | System.IO.File.Delete(file); | 59 | System.IO.File.Delete(file); |
59 | } | 60 | } |
60 | } | 61 | } |