From 60ad6765047ee651ca74e236064158cb63f0178e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 22 Nov 2017 10:42:38 +0100 Subject: [PATCH] fix(address): avoid logs... --- src/address/address.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/address/address.cpp b/src/address/address.cpp index 7c562f198..9dd1e915f 100644 --- a/src/address/address.cpp +++ b/src/address/address.cpp @@ -48,16 +48,22 @@ Address::Address (const Address &src) : ClonableObject(*new AddressPrivate) { Address::Address (const IdentityAddress &src) : ClonableObject(*new AddressPrivate) { L_D(); - string uri = src.getScheme() + ":" + src.getUsername() + "@"; - if (src.getDomain().find(':') != string::npos) - uri += "[" + src.getDomain() + "]"; - else - uri += src.getDomain(); + + const string &username = src.getUsername(); + if (username.empty()) + return; + const string &domain = src.getDomain(); + if (domain.empty()) + return; + + string uri = src.getScheme() + ":" + username + "@" + ( + domain.find(':') != string::npos ? "[" + domain + "]" : domain + ); + if (src.hasGruu()) uri += "?gr=" + src.getGruu(); - if (!(d->internalAddress = sal_address_new(L_STRING_TO_C(uri)))) { - lWarning() << "Cannot create Address, bad IdentityAddress source"; - } + + d->internalAddress = sal_address_new(L_STRING_TO_C(uri)); } Address::~Address () {