fixed logic surrounding subscription cancel

1) When channel is destroyed, but subscription not installed into a server 2) When subscription is destroyed, but has not been installed in server
2004-05-21 00:57:51 +00:00
parent 41aeb709e5
commit 329172afc7
4 changed files with 19 additions and 7 deletions
--- a/src/ca/netSubscription.cpp
+++ b/src/ca/netSubscription.cpp
@@ -170,6 +170,16 @@ void netSubscription::subscribeIfRequired (
    }
 }

+void netSubscription::unsubscribeIfRequired ( 
+    epicsGuard < epicsMutex > & guard, nciu & chan )
+{
+    if ( this->subscribed ) {
+        chan.getPIIU(guard)->subscriptionCancelRequest ( 
+            guard, chan, *this );
+        this->subscribed = false;
+    }
+}
+
 void netSubscription::subscriptionUpdateIfRequired (
    epicsGuard < epicsMutex > & guard, nciu & chan )
 {