From e849feeb1350ddee6ad9b9b96a4d43d68edf3f61 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 4 Oct 2001 00:02:27 +0000
Subject: [PATCH] fixed proper shutdown of local CA subscriptions

---
 src/db/dbServiceIO.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/db/dbServiceIO.cpp b/src/db/dbServiceIO.cpp
index 0eeb9f035..f67f84d5f 100644
--- a/src/db/dbServiceIO.cpp
+++ b/src/db/dbServiceIO.cpp
@@ -257,17 +257,17 @@ void dbServiceIO::destroyAllIO ( dbChannelIO & chan )
         while ( ( pIO = chan.dbServicePrivateListOfIO::eventq.get() ) ) {
             this->ioTable.remove ( *pIO );
             tmp.add ( *pIO );
-            // this prevents a db event callback from coming 
-            // through after the IO is deleted
-            pIO->unsubscribe ();
         }
         if ( chan.dbServicePrivateListOfIO::pBlocker ) {
             this->ioTable.remove ( *chan.dbServicePrivateListOfIO::pBlocker );
         }
     }
     while ( ( pIO = tmp.get() ) ) {
+        // This prevents a db event callback from coming 
+        // through after the IO is deleted
+        pIO->unsubscribe ();
         // If they call ioCancel() here it will be ignored
-        // because the IO has been unregistered above
+        // because the IO has been unregistered above.
         pIO->channelDeleteException ();
         pIO->destroy ();
     }