OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

managed to produce and kill the same exception on mono as on .net. Hopefully 

this means .net is fixed.
afrisby
Sean Dague 2007-11-14 16:35:51 +00:00
parent 28ff73129b
commit ec48b67276
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
View File

@ -247,6 +247,7 @@ namespace OpenSim.DataStore.MonoSqlite
{ {
int revision = Util.UnixTimeSinceEpoch(); int revision = Util.UnixTimeSinceEpoch();
SqliteConnection conn = new SqliteConnection(connectionString); SqliteConnection conn = new SqliteConnection(connectionString);
conn.Open();
MainLog.Instance.Verbose("DATASTORE", "Storing terrain revision r" + revision.ToString()); MainLog.Instance.Verbose("DATASTORE", "Storing terrain revision r" + revision.ToString());
DataTable terrain = ds.Tables["terrain"]; DataTable terrain = ds.Tables["terrain"];
@ -263,11 +264,13 @@ namespace OpenSim.DataStore.MonoSqlite
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
conn.Close();
} }
public double[,] LoadTerrain(LLUUID regionID) public double[,] LoadTerrain(LLUUID regionID)
{ {
SqliteConnection conn = new SqliteConnection(connectionString); SqliteConnection conn = new SqliteConnection(connectionString);
conn.Open();
double[,] terret = new double[256,256]; double[,] terret = new double[256,256];
terret.Initialize(); terret.Initialize();
String sql = "select RegionUUID, Revision, Heightfield from terrain" + String sql = "select RegionUUID, Revision, Heightfield from terrain" +
@ -299,12 +302,14 @@ namespace OpenSim.DataStore.MonoSqlite
else else
{ {
MainLog.Instance.Verbose("DATASTORE", "No terrain found for region"); MainLog.Instance.Verbose("DATASTORE", "No terrain found for region");
conn.Close();
return null; return null;
} }
MainLog.Instance.Verbose("DATASTORE", "Loaded terrain revision r" + rev.ToString()); MainLog.Instance.Verbose("DATASTORE", "Loaded terrain revision r" + rev.ToString());
} }
} }
conn.Close();
return terret; return terret;
} }