Index: cac.cpp
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/cac.cpp,v
retrieving revision 1.180.2.31
retrieving revision 1.180.2.32
diff -u -r1.180.2.31 -r1.180.2.32
--- cac.cpp	22 Nov 2005 00:11:15 -0000	1.180.2.31
+++ cac.cpp	8 Dec 2005 16:22:14 -0000	1.180.2.32
@@ -1133,13 +1133,13 @@
 void cac::destroyIIU ( tcpiiu & iiu )
 {
     {
-        epicsGuard < epicsMutex > cbGuard ( this->cbMutex );
+        callbackManager mgr ( this->notify, this->cbMutex );
         epicsGuard < epicsMutex > guard ( this->mutex );
         this->iiuUninstallInProgress = true;
         if ( iiu.channelCount ( guard ) ) {
             char hostNameTmp[64];
             iiu.getHostName ( guard, hostNameTmp, sizeof ( hostNameTmp ) );
-            genLocalExcep ( cbGuard, guard, *this, ECA_DISCONN, hostNameTmp );
+            genLocalExcep ( mgr.cbGuard, guard, *this, ECA_DISCONN, hostNameTmp );
         }
         osiSockAddr addr = iiu.getNetworkAddress ( guard );
         if ( addr.sa.sa_family == AF_INET ) {
@@ -1151,7 +1151,7 @@
         }
        
         assert ( this->pudpiiu );
-        iiu.disconnectAllChannels ( cbGuard, guard, *this->pudpiiu );
+        iiu.disconnectAllChannels ( mgr.cbGuard, guard, *this->pudpiiu );
 
         this->serverTable.remove ( iiu );
         this->circuitList.remove ( iiu );