diff --git a/src/pvaClientChannel.cpp b/src/pvaClientChannel.cpp index 8a11213..c3f7e97 100644 --- a/src/pvaClientChannel.cpp +++ b/src/pvaClientChannel.cpp @@ -198,9 +198,6 @@ void PvaClientChannel::channelStateChange( if(connectState==connectActive) waitingForConnect = true; if(connectionState!=Channel::CONNECTED) { Lock xx(mutex); - string mess(channelName + - " connection state " + Channel::ConnectionStateNames[connectionState]); - message(mess,errorMessage); connectState = notConnected; } else { Lock xx(mutex); diff --git a/src/pvaClientGet.cpp b/src/pvaClientGet.cpp index ac792bd..45cfd79 100644 --- a/src/pvaClientGet.cpp +++ b/src/pvaClientGet.cpp @@ -134,19 +134,14 @@ void PvaClientGet::checkConnectState() } } -// from ChannelGetRequester string PvaClientGet::getRequesterName() { - PvaClientPtr yyy = pvaClient.lock(); - if(!yyy) return string("PvaClientGet::getRequesterName PvaClient isDestroyed"); - return yyy->getRequesterName(); + return pvaClientChannel->getRequesterName(); } void PvaClientGet::message(string const & message,MessageType messageType) { - PvaClientPtr yyy = pvaClient.lock(); - if(!yyy) return; - yyy->message(message, messageType); + pvaClientChannel->message(message,messageType); } void PvaClientGet::channelGetConnect( diff --git a/src/pvaClientMonitor.cpp b/src/pvaClientMonitor.cpp index 76dd13b..5e17cd3 100644 --- a/src/pvaClientMonitor.cpp +++ b/src/pvaClientMonitor.cpp @@ -201,16 +201,12 @@ void PvaClientMonitor::checkMonitorState() string PvaClientMonitor::getRequesterName() { - PvaClientPtr yyy = pvaClient.lock(); - if(!yyy) return string("PvaClientMonitor::getRequesterName() PvaClient isDestroyed"); - return yyy->getRequesterName(); + return pvaClientChannel->getRequesterName(); } void PvaClientMonitor::message(string const & message,MessageType messageType) { - PvaClientPtr yyy = pvaClient.lock(); - if(!yyy) return; - yyy->message(message, messageType); + pvaClientChannel->message(message,messageType); } void PvaClientMonitor::monitorConnect( diff --git a/src/pvaClientProcess.cpp b/src/pvaClientProcess.cpp index 789fe44..a8cae1b 100644 --- a/src/pvaClientProcess.cpp +++ b/src/pvaClientProcess.cpp @@ -111,19 +111,14 @@ PvaClientProcess::~PvaClientProcess() } } -// from ChannelProcessRequester string PvaClientProcess::getRequesterName() { - PvaClientPtr yyy = pvaClient.lock(); - if(!yyy) throw std::runtime_error("pvaClient was destroyed"); - return yyy->getRequesterName(); + return pvaClientChannel->getRequesterName(); } void PvaClientProcess::message(string const & message,MessageType messageType) { - PvaClientPtr yyy = pvaClient.lock(); - if(!yyy) throw std::runtime_error("pvaClient was destroyed"); - yyy->message(message, messageType); + pvaClientChannel->message(message,messageType); } void PvaClientProcess::channelProcessConnect( diff --git a/src/pvaClientPut.cpp b/src/pvaClientPut.cpp index 81d6196..185147a 100644 --- a/src/pvaClientPut.cpp +++ b/src/pvaClientPut.cpp @@ -138,16 +138,12 @@ void PvaClientPut::checkConnectState() string PvaClientPut::getRequesterName() { - PvaClientPtr yyy = pvaClient.lock(); - if(!yyy) return string("PvaClientPut::getRequesterName() PvaClient isDestroyed"); - return yyy->getRequesterName(); + return pvaClientChannel->getRequesterName(); } void PvaClientPut::message(string const & message,MessageType messageType) { - PvaClientPtr yyy = pvaClient.lock(); - if(!yyy) return; - yyy->message(message, messageType); + pvaClientChannel->message(message,messageType); } void PvaClientPut::channelPutConnect( diff --git a/src/pvaClientPutGet.cpp b/src/pvaClientPutGet.cpp index 2f0e47b..e8e25f9 100644 --- a/src/pvaClientPutGet.cpp +++ b/src/pvaClientPutGet.cpp @@ -150,16 +150,12 @@ void PvaClientPutGet::checkPutGetState() string PvaClientPutGet::getRequesterName() { - PvaClientPtr yyy = pvaClient.lock(); - if(!yyy) return string("PvaClientPutGet::getRequesterName() PvaClient isDestroyed"); - return yyy->getRequesterName(); + return pvaClientChannel->getRequesterName(); } void PvaClientPutGet::message(string const & message,MessageType messageType) { - PvaClientPtr yyy = pvaClient.lock(); - if(!yyy) return; - yyy->message(message, messageType); + pvaClientChannel->message(message,messageType); } void PvaClientPutGet::channelPutGetConnect(