diff --git a/src/groups/mqb/mqba/mqba_clientsession.cpp b/src/groups/mqb/mqba/mqba_clientsession.cpp index 0d1d5674c..f381bb2d0 100644 --- a/src/groups/mqb/mqba/mqba_clientsession.cpp +++ b/src/groups/mqb/mqba/mqba_clientsession.cpp @@ -753,15 +753,19 @@ void ClientSession::onHandleConfiguredDispatched( ClientSessionState::QueueStateMap::iterator queueStateIter = d_queueSessionManager.queues().find(qId); + + d_currentOpDescription << "Configure queue [qId=" << qId; + if (queueStateIter != d_queueSessionManager.queues().end()) { - d_currentOpDescription - << "Configure queue '" - << queueStateIter->second.d_handle_p->queue()->uri() << "'"; - } - else { - d_currentOpDescription << "Configure queue [qId=" << qId << "]"; + if (queueStateIter->second.d_handle_p) { + d_currentOpDescription + << ", uri='" + << queueStateIter->second.d_handle_p->queue()->uri() << "'"; + } } + d_currentOpDescription << "]"; + if (isDisconnected()) { // The client is disconnected or the channel is down logOperationTime(d_currentOpDescription);