1 files changed, 27 insertions, 15 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs
index 12b2750..cf114d1 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
 {
@@ -40,12 +40,10 @@ namespace OpenSim.Data.SQLite
     /// </summary>
     public class SQLiteFramework
     {
-        protected SqliteConnection m_Connection;
+        protected Object m_lockObject = new Object();
 
         protected SQLiteFramework(string connectionString)
         {
-            m_Connection = new SqliteConnection(connectionString);
-            m_Connection.Open();
         }
 
         //////////////////////////////////////////////////////////////
@@ -53,27 +51,41 @@ namespace OpenSim.Data.SQLite
         // All non queries are funneled through one connection
         // to increase performance a little
         //
-        protected int ExecuteNonQuery(SqliteCommand cmd)
+        protected int ExecuteNonQuery(SqliteCommand cmd, SqliteConnection connection)
         {
-            lock (m_Connection)
+            lock (connection)
             {
-                cmd.Connection = m_Connection;
+/*
+                SqliteConnection newConnection =
+                        (SqliteConnection)((ICloneable)connection).Clone();
+                newConnection.Open();
+
+                cmd.Connection = newConnection;
+*/
+                cmd.Connection = connection;
+                //Console.WriteLine("XXX " + cmd.CommandText);
 
                 return cmd.ExecuteNonQuery();
             }
         }
-        
-        protected IDataReader ExecuteReader(SqliteCommand cmd)
+
+        protected IDataReader ExecuteReader(SqliteCommand cmd, SqliteConnection connection)
         {
-            SqliteConnection newConnection =
-                    (SqliteConnection)((ICloneable)m_Connection).Clone();
-            newConnection.Open();
+            lock (connection)
+            {
+                //SqliteConnection newConnection =
+                //        (SqliteConnection)((ICloneable)connection).Clone();
+                //newConnection.Open();
+
+                //cmd.Connection = newConnection;
+                cmd.Connection = connection;
+                //Console.WriteLine("XXX " + cmd.CommandText);
 
-            cmd.Connection = newConnection;
-            return cmd.ExecuteReader();
+                return cmd.ExecuteReader();
+            }
         }
 
-        protected void CloseReaderCommand(SqliteCommand cmd)
+        protected void CloseCommand(SqliteCommand cmd)
         {
             cmd.Connection.Close();
             cmd.Connection.Dispose();