svn commit: r924521 - in /hadoop/zookeeper/trunk: CHANGES.txt src/c/src/zookeeper.c

[ph...@apache.org]

Author: phunt
Date: Wed Mar 17 22:12:37 2010
New Revision: 924521

URL: http://svn.apache.org/viewvc?rev=924521&view=rev
Log:
ZOOKEEPER-591. The C Client cannot exit properly in some situation

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/src/c/src/zookeeper.c

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=924521&r1=924520&r2=924521&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Wed Mar 17 22:12:37 2010
@@ -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)

Modified: hadoop/zookeeper/trunk/src/c/src/zookeeper.c
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/src/zookeeper.c?rev=924521&r1=924520&r2=924521&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/c/src/zookeeper.c (original)
+++ hadoop/zookeeper/trunk/src/c/src/zookeeper.c Wed Mar 17 22:12:37 2010
@@ -2226,7 +2226,7 @@ static int add_completion(zhandle_t *zh,
     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,