From 5430388d1bb32b1335ee10d3c6741be87cce1612 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 14 May 2002 23:41:45 +0000 Subject: [PATCH] fixed another tcp shutdown problem --- src/ca/cac.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp index 01d3b55fe..c271ac109 100644 --- a/src/ca/cac.cpp +++ b/src/ca/cac.cpp @@ -1377,16 +1377,17 @@ bool cac::verifyAndDisconnectChan ( } void cac::disconnectChannel ( - epicsGuard < callbackMutex > & cbLocker, // X aCC 431 - epicsGuard < cacMutex > & locker, + epicsGuard < callbackMutex > & cbGuard, // X aCC 431 + epicsGuard < cacMutex > & guard, nciu & chan ) { - this->disconnectAllIO ( locker, chan, true ); + this->disconnectAllIO ( guard, chan, true ); + chan.getPIIU()->uninstallChan ( guard, chan ); chan.disconnect ( *this->pudpiiu ); this->pudpiiu->installChannel ( chan ); - epicsGuardRelease < cacMutex > autoMutexRelease ( locker ); - chan.connectStateNotify ( cbLocker ); - chan.accessRightsNotify ( cbLocker ); + epicsGuardRelease < cacMutex > autoMutexRelease ( guard ); + chan.connectStateNotify ( cbGuard ); + chan.accessRightsNotify ( cbGuard ); } bool cac::badTCPRespAction ( epicsGuard < callbackMutex > &, tcpiiu & iiu,