From c1e2dc29bd755d100183d73e67f86535c5f83d2c Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Mon, 2 Feb 2004 20:13:15 +0000 Subject: [PATCH] removed overly stringent assert --- src/ca/nciu.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ca/nciu.cpp b/src/ca/nciu.cpp index 09ad607d1..31c4273f0 100644 --- a/src/ca/nciu.cpp +++ b/src/ca/nciu.cpp @@ -560,13 +560,15 @@ void nciu::sendSubscriptionUpdateRequests ( epicsGuard < epicsMutex > & guard ) tsDLIter < baseNMIU > next = pNetIO; next++; class netSubscription * pSubscr = pNetIO->isSubscription (); - // disconnected channels should have only subscription IO attached - assert ( pSubscr ); - try { - pSubscr->subscriptionUpdateIfRequired ( guard, *this ); - } - catch ( ... ) { - errlogPrintf ( "CAC: failed to send subscription request during channel connect\n" ); + // the channel becomes connected while subscription update requests + // are pending so IO types other than subscription IO might be attached + if ( pSubscr ) { + try { + pSubscr->subscriptionUpdateIfRequired ( guard, *this ); + } + catch ( ... ) { + errlogPrintf ( "CAC: failed to send subscription request during channel connect\n" ); + } } pNetIO = next; }