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

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

View File

@@ -240,7 +240,7 @@ Status PvaClientMonitor::waitConnect()
{
if(PvaClient::getDebug()) cout << "PvaClientMonitor::waitConnect\n";
if(connectState==connected) {
if(connectStatus.isOK()) connectState = connectIdle;
if(!connectStatus.isOK()) connectState = connectIdle;
return connectStatus;
}
if(connectState!=connectActive) {
@@ -264,7 +264,7 @@ Status PvaClientMonitor::waitConnect()
return connectStatus;
}
void PvaClientMonitor::setRequester(PvaClientMonitorRequesterPtr const & pvaClientMonitorrRequester)
void PvaClientMonitor::setRequester(PvaClientMonitorRequesterPtr const & pvaClientMonitorRequester)
{
if(PvaClient::getDebug()) {
string channelName("disconnected");
@@ -274,7 +274,7 @@ void PvaClientMonitor::setRequester(PvaClientMonitorRequesterPtr const & pvaClie
<< " channelName " << channelName
<< endl;
}
this->pvaClientMonitorRequester = pvaClientMonitorrRequester;
this->pvaClientMonitorRequester = pvaClientMonitorRequester;
}
void PvaClientMonitor::start()