epics/pvaClient
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fix bug in src/pvaClientMonitor.cpp; other minor changes

Browse Source
This commit is contained in:
mrkraimer
2016-06-10 07:48:36 -04:00
parent 04b5434b69
commit 32fb16fcf0
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pvaClientGet.cpp
View File

@@ -150,7 +150,7 @@ void PvaClientGet::channelGetConnect(
Channel::shared_pointer chan(channel.lock());
if(chan) channelName = chan->getChannelName();
cout << "PvaClientGet::channelGetConnect"
<< " channelName " << channelGet->getChannel()->getChannelName()
<< " channelName " << channelName
<< " status.isOK " << (status.isOK() ? "true" : "false")
<< endl;
}
@@ -208,17 +208,16 @@ void PvaClientGet::connect()
void PvaClientGet::issueConnect()
{
Channel::shared_pointer chan(channel.lock());
if(connectState!=connectIdle) {
Channel::shared_pointer chan(channel.lock());
string channelName("disconnected");
if(chan) channelName = chan->getChannelName();
string message = string("channel ") + channelName
+ " pvaClientGet already connected ";
throw std::runtime_error(message);
}
connectState = connectActive;
Channel::shared_pointer chan(channel.lock());
if(chan) {
connectState = connectActive;
channelGet = chan->createChannelGet(channelGetRequester,pvRequest);
return;
}