[Opensync-commits] r5039 - trunk/opensync/engine

[<dg...@su...>]

Author: dgollub
Date: Tue Jan  6 04:15:09 2009
New Revision: 5039
URL: http://www.opensync.org/changeset/5039

Log:
Replace mapping-table inconsistent assert() protection with a real
error. Since this might happen in future due to various crazy bugs.

Modified:
   trunk/opensync/engine/opensync_mapping_engine.c

Modified: trunk/opensync/engine/opensync_mapping_engine.c
==============================================================================
--- trunk/opensync/engine/opensync_mapping_engine.c	Tue Jan  6 03:06:49 2009	(r5038)
+++ trunk/opensync/engine/opensync_mapping_engine.c	Tue Jan  6 04:15:09 2009	(r5039)
@@ -72,7 +72,12 @@
 		
 		OSyncMember *member = osync_client_proxy_get_member(sink_engine->proxy);
 		OSyncMappingEntry *mapping_entry = osync_mapping_find_entry_by_member_id(mapping, osync_member_get_id(member));
-		osync_assert(mapping_entry);
+		if (!mapping_entry) {
+			osync_error_set(error, OSYNC_ERROR_GENERIC, "Inconsistency in Mapping Table "
+					"for Object Type \"%s\" detected.",
+					osync_obj_engine_get_objtype(engine->parent));
+			goto error;
+		}
 		
 		entry_engine = osync_entry_engine_new(mapping_entry, engine, sink_engine, parent, error);
 		if (!entry_engine)