You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2012/09/07 08:15:00 UTC

svn commit: r1381897 - in /zookeeper/trunk: CHANGES.txt src/contrib/zkperl/ZooKeeper.xs

Author: mahadev
Date: Fri Sep  7 06:14:59 2012
New Revision: 1381897

URL: http://svn.apache.org/viewvc?rev=1381897&view=rev
Log:
ZOOKEEPER-1380. zkperl: _zk_release_watch doesn't remove items properly from the watch list. (Botond Hejj via mahadev)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/contrib/zkperl/ZooKeeper.xs

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1381897&r1=1381896&r2=1381897&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Sep  7 06:14:59 2012
@@ -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,

Modified: zookeeper/trunk/src/contrib/zkperl/ZooKeeper.xs
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkperl/ZooKeeper.xs?rev=1381897&r1=1381896&r2=1381897&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zkperl/ZooKeeper.xs (original)
+++ zookeeper/trunk/src/contrib/zkperl/ZooKeeper.xs Fri Sep  7 06:14:59 2012
@@ -251,12 +251,12 @@ static void _zk_release_watch(pTHX_ zk_w
     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) {