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

Merged changes from 3.14 branch

Browse Source 
Up to revno 12420 inclusive.
This commit is contained in:
Andrew Johnson
2013-06-07 18:08:38 -05:00
parent 2eb48f43eb ef5d88d3e5
commit 2be5e15346
27 changed files with 246 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ca/client/syncgrp.cpp
View File

@@ -134,15 +134,15 @@ extern "C" int epicsShareAPI ca_sg_block (
if ( status == ECA_NORMAL ) {
CASG * pcasg;
{
epicsGuard < epicsMutex > guard ( pcac->mutex );
pcasg = pcac->lookupCASG ( guard, gid );
if ( pcasg ) {
status = pcasg->block (
pcac->pCallbackGuard.get (), guard, timeout );
}
else {
status = ECA_BADSYNCGRP;
}
epicsGuard < epicsMutex > guard ( pcac->mutex );
pcasg = pcac->lookupCASG ( guard, gid );
if ( pcasg ) {
status = pcasg->block (
pcac->pCallbackGuard.get (), guard, timeout );
}
else {
status = ECA_BADSYNCGRP;
}
}
if ( pcasg ) {
sync_group_reset ( *pcac, *pcasg );