From 26339cdbed4717f609d52adcb21e877c59019d55 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 6 Nov 2007 17:58:36 +0000
Subject: [PATCH] additional changes for the mantis 296 pach

---
 src/rsrv/camessage.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/rsrv/camessage.c b/src/rsrv/camessage.c
index d0bf9b279..4e661c969 100644
--- a/src/rsrv/camessage.c
+++ b/src/rsrv/camessage.c
@@ -1103,7 +1103,7 @@ LOCAL void casAccessRightsCB(ASCLIENTPVT ascpvt, asClientStatus type)
                 ellAdd ( &pclient->chanPendingUpdateARList, &pciu->node );
                 sigReq = 1;
             }
-            if ( pciu->state == rsrvCS_inService ) {
+            else if ( pciu->state == rsrvCS_inService ) {
                 ellDelete ( &pclient->chanList, &pciu->node );
                 pciu->state = rsrvCS_inServiceUpdatePendAR;
                 ellAdd ( &pclient->chanPendingUpdateARList, &pciu->node );
@@ -1365,6 +1365,9 @@ LOCAL int claim_ciu_action ( caHdrLargeArray *mp,
             pciu->asClientPVT, 
             casAccessRightsCB);
     if ( status == S_asLib_asNotActive ) {
+        epicsMutexMustLock ( client->chanListLock );
+        pciu->state = rsrvCS_inService;
+        epicsMutexUnlock ( client->chanListLock );
         /*
          * force the initial AR update followed by claim response
          */
@@ -2007,7 +2010,6 @@ LOCAL int clear_channel_reply ( caHdrLargeArray *mp,
       * remove from access control list
       */
      status = asRemoveClient(&pciu->asClientPVT);
-     assert(status == 0 || status == S_asLib_asNotActive);
      if(status != 0 && status != S_asLib_asNotActive){
          errMessage(status, RECORD_NAME(&pciu->addr));
          return RSRV_ERROR;