ZOOKEEPER-1380. zkperl: _zk_release_watch doesn't remove items proper…

…ly from the watch list. (Botond Hejj via mahadev) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1381897 13f79535-47bb-0310-9956-ffa450edef68
dgomezferro · Sep 7, 2012 · f57765e · f57765e
1 parent 21cf327
commit f57765e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -237,6 +237,9 @@ BUGFIXES:
   ZOOKEEPER-1105 c client zookeeper_close not send CLOSE_OP request to server
   (lincoln.lee via michim)
 
+  ZOOKEEPER-1380. zkperl: _zk_release_watch doesn't remove items properly from
+  the watch list. (Botond Hejj via mahadev)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

diff --git a/src/contrib/zkperl/ZooKeeper.xs b/src/contrib/zkperl/ZooKeeper.xs
@@ -251,12 +251,12 @@ static void _zk_release_watch(pTHX_ zk_watch_t *watch, int list)
     if (list) {
         if (watch->prev) {
             watch->prev->next = watch->next;
-            watch->prev = NULL;
         }
         if (watch->next) {
             watch->next->prev = watch->prev;
-            watch->next = NULL;
         }
+        watch->prev = NULL;
+        watch->next = NULL;
     }
 
     if (--watch->ref_count == 0) {