Merge pull request #40 from mrkraimer/master

Fix stateChangeRequester and  channelGet
This commit is contained in:
Marty Kraimer
2017-04-07 13:35:06 -04:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+1
View File
@@ -297,6 +297,7 @@ void PvaClientChannel::setStateChangeRequester(
PvaClientChannelStateChangeRequesterPtr const & stateChangeRequester)
{
this->stateChangeRequester = stateChangeRequester;
stateChangeRequester->channelStateChange(shared_from_this(),channel->isConnected());
}
void PvaClientChannel::connect(double timeout)
+2 -3
View File
@@ -256,7 +256,7 @@ void PvaClientGet::get()
void PvaClientGet::issueGet()
{
if(connectState==connectIdle) connect();
if(getState!=getIdle) {
if(getState==getActive) {
Channel::shared_pointer chan(channel.lock());
string channelName("disconnected");
if(chan) channelName = chan->getChannelName();
@@ -273,7 +273,6 @@ Status PvaClientGet::waitGet()
{
Lock xx(mutex);
if(getState==getComplete) {
getState =getIdle;
return channelGetStatus;
}
if(getState!=getActive){
@@ -286,7 +285,7 @@ Status PvaClientGet::waitGet()
}
}
waitForGet.wait();
getState = getIdle;
getState = getComplete;
return channelGetStatus;
}
PvaClientGetDataPtr PvaClientGet::getData()