Lock the database from concurrent accesses.

svn path=/trunk/; revision=9154

diff --git a/camel/camel-db.c b/camel/camel-db.c
index f2f6559..7862727 100644 (file)
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -46,14 +46,23 @@ cdb_sql_exec (sqlite3 *db, const char* stmt, CamelException *ex)
 
        d(g_print("Camel SQL Exec:\n%s\n", stmt));
 
+       /* FIXME: TWo calls on the same database even with different sqlite handles is hanging. This needs to be looked and if needed upstreamed to sqlite. 
+          Until then , a static lock will do. --Sankar */
+
+       static GStaticRecMutex connecting_to_db = G_STATIC_REC_MUTEX_INIT;      
+
+       g_static_rec_mutex_lock (&connecting_to_db);
+
        ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
        while (ret == SQLITE_BUSY || ret == SQLITE_LOCKED || ret == -1) {
-               ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
+                       ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
        }
-       
+
+       g_static_rec_mutex_unlock (&connecting_to_db);
+
        if (ret != SQLITE_OK) {
-               d(g_print ("Error in SQL EXEC statement: %s [%s].\n", stmt, errmsg));
-               if (ex) 
+                       d(g_print ("Error in SQL EXEC statement: %s [%s].\n", stmt, errmsg));
+                       if (ex) 
                        camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _(errmsg));
                sqlite3_free (errmsg);
                return -1;
@@ -123,15 +132,17 @@ camel_db_close (CamelDB *cdb)
 int
 camel_db_command (CamelDB *cdb, const char *stmt, CamelException *ex)
 {
-       int ret;
-       
-       if (!cdb)
-               return TRUE;
-       g_mutex_lock (cdb->lock);
-       d(g_print("Executing: %s\n", stmt));
-       ret = cdb_sql_exec (cdb->db, stmt, ex);
-       g_mutex_unlock (cdb->lock);
-       return ret;
+               int ret;
+
+               if (!cdb)
+                               return TRUE;
+               g_mutex_lock (cdb->lock);
+
+               d(g_print("Executing: %s\n", stmt));
+               ret = cdb_sql_exec (cdb->db, stmt, ex);
+               g_mutex_unlock (cdb->lock);
+
+               return ret;
 }
 
 

diff --git a/camel/camel-disco-store.c b/camel/camel-disco-store.c
index b37be34..7b11cb6 100644 (file)
--- a/camel/camel-disco-store.c
+++ b/camel/camel-disco-store.c
@@ -323,7 +323,7 @@ set_status(CamelDiscoStore *disco_store, CamelDiscoStoreStatus status, CamelExce
                                        folder = folders->pdata[i];
                                        if (CAMEL_CHECK_TYPE(folder, CAMEL_DISCO_FOLDER_TYPE)
                                            && (sync || ((CamelDiscoFolder *)folder)->offline_sync)) {
-                                               camel_disco_folder_prepare_for_offline((CamelDiscoFolder *)folder, "(match-all)", &x);
+                                               camel_disco_folder_prepare_for_offline((CamelDiscoFolder *)folder, "", &x);
                                                camel_exception_clear(&x);
                                        }
                                        camel_object_unref(folder);