handle weak_pointer.lock() properly

This commit is contained in:
mrkraimer
2016-05-17 15:04:02 -04:00
parent 40fb22ebd9
commit adc008dee6

View File

@@ -233,8 +233,8 @@ void PvaClientChannel::channelStateChange(
string PvaClientChannel::getRequesterName()
{
PvaClientPtr yyy = pvaClient.lock();
if(!yyy) throw std::runtime_error(
"PvaClientChannel::getRequesterName() PvaClientChannel isDestroyed");
if(!yyy) throw std::runtime_error(
"PvaClientChannel::getRequesterName() PvaClient isDestroyed");
return yyy->getRequesterName();
}
@@ -243,8 +243,8 @@ void PvaClientChannel::message(
MessageType messageType)
{
PvaClientPtr yyy = pvaClient.lock();
if(isDestroyed) throw std::runtime_error(
"PvaClientChannel::message() pvaClientChannel isDestroyed");
if(!yyy) throw std::runtime_error(
"PvaClientChannel::message() pvaClient isDestroyed");
yyy->message(channelName + " " + message, messageType);
}