From 42957877d90244a8f2e0342546d8cf448a2864a1 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 8 Jul 2009 21:43:38 +0000 Subject: [PATCH] fix for mantis 346 --- src/ca/netSubscription.cpp | 4 ++-- src/ca/netWriteNotifyIO.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ca/netSubscription.cpp b/src/ca/netSubscription.cpp index 5c315834c..9a29ac2b6 100644 --- a/src/ca/netSubscription.cpp +++ b/src/ca/netSubscription.cpp @@ -92,9 +92,9 @@ void netSubscription::exception ( this->subscribed = false; } if ( status == ECA_CHANDESTROY ) { + this->privateChanForIO.ioCompletionNotify ( guard, *this ); this->notify.exception ( guard, status, pContext, UINT_MAX, 0 ); - this->privateChanForIO.ioCompletionNotify ( guard, *this ); this->~netSubscription (); recycle.recycleSubscription ( guard, *this ); } @@ -116,9 +116,9 @@ void netSubscription::exception ( this->subscribed = false; } if ( status == ECA_CHANDESTROY ) { + this->privateChanForIO.ioCompletionNotify ( guard, *this ); this->notify.exception ( guard, status, pContext, UINT_MAX, 0 ); - this->privateChanForIO.ioCompletionNotify ( guard, *this ); this->~netSubscription (); recycle.recycleSubscription ( guard, *this ); } diff --git a/src/ca/netWriteNotifyIO.cpp b/src/ca/netWriteNotifyIO.cpp index b9465a67d..68d4992e7 100644 --- a/src/ca/netWriteNotifyIO.cpp +++ b/src/ca/netWriteNotifyIO.cpp @@ -64,8 +64,8 @@ void netWriteNotifyIO::completion ( epicsGuard < epicsMutex > & guard, cacRecycle & recycle ) { - this->notify.completion ( guard ); this->privateChanForIO.ioCompletionNotify ( guard, *this ); + this->notify.completion ( guard ); this->~netWriteNotifyIO (); recycle.recycleWriteNotifyIO ( guard, *this ); }