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

call stateChangeRequester when connecting; ChannelGet.get only does one get

Browse Source
This commit is contained in:
mrkraimer
2017-03-30 10:41:10 -04:00
parent 2f75a967de
commit c019b205dd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pvaClientGet.cpp
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()