From 6de298d20285730e06fb41488ee6d97edfffbfab Mon Sep 17 00:00:00 2001 From: Kamen Mazdrashki Date: Fri, 13 Jun 2014 14:20:00 +0200 Subject: [PATCH] oc/MAPIStoreMapping: Split the check for existing entry so we have better error message Signed-off-by: Kamen Mazdrashki --- OpenChange/MAPIStoreMapping.m | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/OpenChange/MAPIStoreMapping.m b/OpenChange/MAPIStoreMapping.m index 1bd27b963..194488bc7 100644 --- a/OpenChange/MAPIStoreMapping.m +++ b/OpenChange/MAPIStoreMapping.m @@ -217,14 +217,22 @@ MAPIStoreMappingKeyFromId (uint64_t idNbr) bool rc; oldURL = [self urlFromID: idNbr]; - oldIdNbr = [self idFromURL: urlString]; - if (oldURL != NULL || oldIdNbr != NSNotFound) + if (oldURL != NULL) { [self errorWithFormat: - @"attempt to double register an entry ('%@', %lld," - @" 0x%.16"PRIx64")", - urlString, idNbr, idNbr]; - rc = NO; + @"url with idNbr already registered: (oldUrl='%@', newUrl='%@', id=x%.16"PRIx64")", + oldURL, urlString, idNbr]; + return NO; + } + + oldIdNbr = [self idFromURL: urlString]; + if (oldIdNbr != NSNotFound) + { + [self errorWithFormat: + @"attempt to double register an entry with idNbr ('%@', %lld," + @" 0x%.16"PRIx64", oldid=0x%.16"PRIx64")", + urlString, idNbr, idNbr, oldIdNbr]; + return NO; } else {