Merge branch '0.6.9-post-fixes' into share-with-group

1 files changed, 13 insertions, 7 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs
index 12b2750..9567727 100644
--- a/OpenSim/Data/SQLite/SQLiteFramework.cs
+++ b/OpenSim/Data/SQLite/SQLiteFramework.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
 using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 
 namespace OpenSim.Data.SQLite
 {
@@ -65,12 +65,18 @@ namespace OpenSim.Data.SQLite
         
         protected IDataReader ExecuteReader(SqliteCommand cmd)
         {
-            SqliteConnection newConnection =
-                    (SqliteConnection)((ICloneable)m_Connection).Clone();
-            newConnection.Open();
+            lock (m_Connection)
+            {
+                //SqliteConnection newConnection =
+                //        (SqliteConnection)((ICloneable)connection).Clone();
+                //newConnection.Open();
 
-            cmd.Connection = newConnection;
-            return cmd.ExecuteReader();
+                //cmd.Connection = newConnection;
+                cmd.Connection = m_Connection;
+                //Console.WriteLine("XXX " + cmd.CommandText);
+
+                return cmd.ExecuteReader();
+            }
         }
 
         protected void CloseReaderCommand(SqliteCommand cmd)
@@ -80,4 +86,4 @@ namespace OpenSim.Data.SQLite
             cmd.Dispose();
         }
     }
-}
+}
\ No newline at end of file