Author: phunt
Date: Wed Oct 20 16:26:12 2010
New Revision: 1025631

URL: http://svn.apache.org/viewvc?rev=1025631&view=rev
Log:
ZOOKEEPER-804. c unit tests failing due to "assertion cptr failed" (second 
patch)

Modified:
    hadoop/zookeeper/branches/branch-3.3/CHANGES.txt
    hadoop/zookeeper/branches/branch-3.3/src/c/src/zookeeper.c

Modified: hadoop/zookeeper/branches/branch-3.3/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1025631&r1=1025630&r2=1025631&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.3/CHANGES.txt (original)
+++ hadoop/zookeeper/branches/branch-3.3/CHANGES.txt Wed Oct 20 16:26:12 2010
@@ -44,6 +44,9 @@ BUGFIXES:
   ZOOKEEPER-893. ZooKeeper high cpu usage when invalid requests
   (Thijs Terlouw via phunt)
 
+  ZOOKEEPER-804. c unit tests failing due to "assertion cptr failed"
+  (second try - Jared Cantwell via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-789. Improve FLE log messages (flavio via phunt)

Modified: hadoop/zookeeper/branches/branch-3.3/src/c/src/zookeeper.c
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/src/c/src/zookeeper.c?rev=1025631&r1=1025630&r2=1025631&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.3/src/c/src/zookeeper.c (original)
+++ hadoop/zookeeper/branches/branch-3.3/src/c/src/zookeeper.c Wed Oct 20 
16:26:12 2010
@@ -1954,7 +1954,7 @@ int zookeeper_process(zhandle_t *zh, int
                     destroy_completion_entry(cptr);
                     cptr = NULL;
                 }
-                return ZINVALIDSTATE;
+                return api_epilog(zh,ZINVALIDSTATE);
             }
             assert(cptr);
             /* The requests are going to come back in order */


Reply via email to