diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index 1430fe407..bcbf98437 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -893,12 +893,10 @@ void cac::lookupChannelAndTransferToTCP ( unsigned cid, unsigned sid, void cac::uninstallChannel ( nciu & chan ) { - { - epicsAutoMutex autoMutex ( this->defaultMutex ); - nciu *pChan = this->chanTable.remove ( chan ); - assert ( pChan = &chan ); - chan.getPIIU ()->detachChannel ( chan ); - } + epicsAutoMutex autoMutex ( this->defaultMutex ); + nciu *pChan = this->chanTable.remove ( chan ); + assert ( pChan = &chan ); + chan.getPIIU ()->detachChannel ( chan ); } void cac::getFDRegCallback ( CAFDHANDLER *&fdRegFuncOut, void *&fdRegArgOut ) const diff --git a/src/ca/netiiu.cpp b/src/ca/netiiu.cpp index 672d8fd95..4eadcb3d6 100644 --- a/src/ca/netiiu.cpp +++ b/src/ca/netiiu.cpp @@ -62,12 +62,10 @@ void netiiu::attachChannel ( nciu &chan ) // calling this void netiiu::detachChannel ( nciu &chan ) { - { - epicsAutoMutex autoMutex ( this->mutex ); - this->channelList.remove ( chan ); - if ( this->channelList.count () == 0u ) { - this->lastChannelDetachNotify (); - } + epicsAutoMutex autoMutex ( this->mutex ); + this->channelList.remove ( chan ); + if ( this->channelList.count () == 0u ) { + this->lastChannelDetachNotify (); } }