From cf7bd1a9ae54d4a43032346a7e0f33829a5d2ba5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 May 2013 14:47:00 +0200 Subject: [PATCH] Remove assert and fix logging --- src/libtomahawk/network/Servent.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp index d3fc30488..955b8554a 100644 --- a/src/libtomahawk/network/Servent.cpp +++ b/src/libtomahawk/network/Servent.cpp @@ -308,9 +308,7 @@ Servent::isValidExternalIP( const QHostAddress& addr ) void Servent::registerOffer( const QString& key, Connection* conn ) { - // The registered connection should always be != NULL - Q_ASSERT( conn != NULL ); - m_offers[key] = QPointer(conn); + m_offers[key] = QPointer(conn); } @@ -928,7 +926,7 @@ Servent::connectToPeer(const peerinfo_ptr& peerInfo, const QList& sipIn void Servent::connectToPeerFailed( const peerinfo_ptr& peerInfo, QList sipInfo, Connection* conn, QTcpSocketExtra* socket ) { - tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Connecting to " << conn->peerIpAddress() << " failed"; + tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Connecting to " << socket->peerAddress().toString() << " failed: " << socket->errorString(); bool connIsNull = socket->_conn.isNull(); cleanupSocket( socket );