Changeset 692

Timestamp:

09/15/05 21:37:06 (3 years ago)

Author:

ehabkost

Message:

Fix Yet Another update_hash/report_success race. This time on knotes support

Files:

• plugins/kdepim/src/knotes.cpp (modified) (3 diffs)

plugins/kdepim/src/knotes.cpp

@@ -195 +195 @@
 }
 
-bool KNotesDataSource::access(OSyncContext *ctx, OSyncChange *chg)
+/** basic access method
+ *
+ * This method is used by both access() and commit_change() method,
+ * so it shouldn't call osync_context_report_success(). On success,
+ * it should just return true and let the caller report success() to
+ * OpenSync
+ */
+bool KNotesDataSource::__access(OSyncContext *ctx, OSyncChange *chg)
 {
         osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ctx, chg);
@@ -277 +284 @@
     }
 
-    osync_context_report_success(ctx);
         osync_trace(TRACE_EXIT, "%s", __func__);
     return true;
@@ -285 +291 @@
 {
         osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ctx, chg);
-    if (!access(ctx, chg)) {
+    if (!__access(ctx, chg)) {
         osync_trace(TRACE_EXIT_ERROR, "%s: Unable to delete note", __func__);
                 return false;
     }
     osync_hashtable_update_hash(hashtable, chg);
+        osync_context_report_success(ctx);
         osync_trace(TRACE_EXIT, "%s", __func__);
     return true;
 }
+
+bool KNotesDataSource::access(OSyncContext *ctx, OSyncChange *chg)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, ctx, chg);
+        if (!__access(ctx, chg)) {
+                osync_trace(TRACE_EXIT_ERROR, "%s: Unable to delete note", __func__);
+                return false;
+    }
+        osync_context_report_success(ctx);
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return true;
+}