From 91e3c129df5234011941d66e1e8793714bb06c79 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 28 Nov 2006 18:51:16 +0000
Subject: [PATCH] db flush extra labor now returns void

---
 src/rsrv/camessage.c    |  9 +--------
 src/rsrv/caservertask.c | 17 +++++------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/rsrv/camessage.c b/src/rsrv/camessage.c
index d6c01624b..75cc32136 100644
--- a/src/rsrv/camessage.c
+++ b/src/rsrv/camessage.c
@@ -1927,14 +1927,7 @@ LOCAL int clear_channel_reply ( caHdrLargeArray *mp,
          freeListFree(rsrvEventFreeList, pevext);
      }
      
-     status = db_flush_extra_labor_event(client->evuser);
-     if (status) {
-        SEND_LOCK(client);
-        send_err(mp, ECA_INTERNAL, client, 
-            "extra labor event didnt flush");
-        SEND_UNLOCK(client);
-        return RSRV_ERROR;
-     }
+     db_flush_extra_labor_event ( client->evuser );
           
      /*
       * send delete confirmed message
diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c
index 0de2b54c1..a171459f3 100644
--- a/src/rsrv/caservertask.c
+++ b/src/rsrv/caservertask.c
@@ -643,22 +643,15 @@ void destroy_tcp_client ( struct client *client )
 
     if ( client->evuser ) {
         /*
-        * turn off extra labor callbacks from the event thread
-        */
+         * turn off extra labor callbacks from the event thread
+         */
         status = db_add_extra_labor_event ( client->evuser, NULL, NULL );
         assert ( ! status );
 
         /*
-        * wait for extra labor in progress to comple
-        */
-        status = db_flush_extra_labor_event ( client->evuser );
-        assert ( ! status );
-
-        /*
-        * wait for any put notify in progress to comple
-        */
-        status = db_flush_extra_labor_event(client->evuser);
-        assert ( ! status );
+         * wait for extra labor in progress to comple
+         */
+        db_flush_extra_labor_event ( client->evuser );
     }
 
     destroyAllChannels ( client, & client->chanList );