ZOOKEEPER-591. The C Client cannot exit properly in some situation

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@924521 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -295,6 +295,9 @@ BUGFIXES:
 
   ZOOKEEPER-591. The C Client cannot exit properly in some situation (mahadev)
 
+  ZOOKEEPER-591_2. The C Client cannot exit properly in some situation
+  (mahadev via phunt)
+
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
   "socket reuse" and failure to close client (phunt via mahadev)

src/c/src/zookeeper.c

@@ -2226,7 +2226,7 @@ static int add_completion(zhandle_t *zh, int xid, int completion_type,
     if (dc == SYNCHRONOUS_MARKER) {
         zh->outstanding_sync++;
     }
-    return ZOK;
+    return rc;
 }
 
 static int add_data_completion(zhandle_t *zh, int xid, data_completion_t dc,