Changeset 3600

Timestamp:

08/26/08 16:14:09 (3 months ago)

Author:

bellmich

Message:

smlDataSyncSendChanges must no be called more than once
(syncml-http-server works now with high level API of libsyncml)

Location:

plugins/syncml/src

Files:

• syncml_common.c (modified) (1 diff)
• syncml_common.h (modified) (1 diff)
• syncml_ds_server.c (modified) (2 diffs)

plugins/syncml/src/syncml_common.c

@@ -662 +662 @@
         env->sessionType = sessionType;
         env->pluginInfo = info;
+        env->gotDatabaseCommits = 0;
         osync_plugin_info_ref(env->pluginInfo);
 

plugins/syncml/src/syncml_common.h

@@ -104 +104 @@
         OSyncContext *disconnectCtx;
         GList *databases;
+        unsigned int gotDatabaseCommits; /* only for OMA DS server */
 
         /* environment data */

plugins/syncml/src/syncml_ds_server.c

@@ -92 +92 @@
     SmlDatabase *database = get_database_from_plugin_info(info);
 
+    database->env->gotDatabaseCommits++;
     database->pendingCommits = get_num_changes(changes);
     osync_trace(TRACE_INTERNAL, "%s - %i changes present to send",
@@ -133 +134 @@
     }
 
-    if (!smlDataSyncSendChanges(database->env->dsObject1, &error))
+    if (g_list_length(database->env->databases) == database->env->gotDatabaseCommits &&
+        !smlDataSyncSendChanges(database->env->dsObject1, &error))
                 goto error;