summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2011-09-30 11:15:08 +0200
committerPatrick Ohly <patrick.ohly@intel.com>2011-09-30 18:19:59 +0200
commit97508022eb590a7101e85c3717a1b02dd7133171 (patch)
treebd229f415f62e4757fad9bed3c7e428eafff9453
parentb0252bdf02720193d1c638ec9ec32c1f4cedc6f3 (diff)
DB_Conflict (409): avoid confusing log message
When the 409 handling call falls back to the older merge handling code, that code ends up logging 207 as the status. Replaced with a full list of possible reasons why the code might have been invoked.
-rwxr-xr-xsrc/sysync/customimplds.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sysync/customimplds.cpp b/src/sysync/customimplds.cpp
index f6ed50a..f84b901 100755
--- a/src/sysync/customimplds.cpp
+++ b/src/sysync/customimplds.cpp
@@ -2849,7 +2849,7 @@ bool TCustomImplDS::implProcessItem(
// while adding, data was merged with pre-existing data from...
// ..either data external from the sync set, such as augmenting a contact with info from a third-party lookup
// ..or another item pre-existing in the sync set.
- PDEBUGPRINTFX(DBG_DATA,("Database adapter indicates that added item was merged with pre-existing data (status 207)"));
+ PDEBUGPRINTFX(DBG_DATA,("Database adapter indicates that added item was merged with pre-existing data (status 207/209/409)"));
// check if the item resulting from merge is known by the client already (in it's pre-merge form, that is)
TMapContainer::iterator conflictingMapPos = findMapByLocalID(localID.c_str(), mapentry_normal);
bool remoteAlreadyKnowsItem = conflictingMapPos!=fMapTable.end();