Merge lp:~niemeyer/gozk/fix-exists into lp:gozk/zookeeper

[Gustavo Niemeyer]

Fix Exists.

https://codereview.appspot.com/5673057/

[Gustavo Niemeyer (niemeyer)]

Reviewers: mp+93266_code.launchpad.net,

Message:
Please take a look.

Description:

https://code.launchpad.net/~niemeyer/gozk/fix-exists/+merge/93266

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/5673057/

Affected files:
   A .lbox
   M zk.go
   M zk_test.go

Index: .lbox
=== <email address hidden> >
<email address hidden>
=== added file '.lbox'
--- .lbox 1970-01-01 00:00:00 +0000
+++ .lbox 2012-02-15 18:05:29 +0000
@@ -0,0 +1,1 @@
+propose -cr -for lp:gozk/zookeeper

Index: zk.go
=== <email address hidden> >
<email address hidden>
=== modified file 'zk.go'
--- zk.go 2012-02-15 17:18:34 +0000
+++ zk.go 2012-02-15 17:51:23 +0000
@@ -574,7 +574,7 @@
   defer C.free(unsafe.Pointer(cpath))

   var cstat Stat
- rc, cerr := C.zoo_wexists(conn.handle, cpath, nil, nil, &stat.c)
+ rc, cerr := C.zoo_wexists(conn.handle, cpath, nil, nil, &cstat.c)

   // We diverge a bit from the usual here: a ZNONODE is not an error
   // for an exists call, otherwise every Exists call would have to check

Index: zk_test.go
=== <email address hidden> >
<email address hidden>
=== modified file 'zk_test.go'
--- zk_test.go 2012-02-15 17:18:34 +0000
+++ zk_test.go 2012-02-15 17:51:23 +0000
@@ -399,6 +399,7 @@

   stat, err = conn.Exists("/zookeeper")
   c.Assert(err, IsNil)
+ c.Assert(stat.NumChildren(), Equals, 1)
  }

  func (s *S) TestExistsAndWatch(c *C) {

[William Reade (fwereade)]

LGTM (nicely spotted!)

https://codereview.appspot.com/5673057/

[Gustavo Niemeyer (niemeyer)]

*** Submitted:

Fix Exists.

R=fwereade
CC=
https://codereview.appspot.com/5673057

https://codereview.appspot.com/5673057/

=== added file '.lbox'
--- .lbox	1970-01-01 00:00:00 +0000
+++ .lbox	2012-02-15 18:15:23 +0000
@@ -0,0 +1,1 @@
+propose -cr -for lp:gozk/zookeeper
 
=== modified file 'zk.go'
--- zk.go	2012-02-15 17:18:34 +0000
+++ zk.go	2012-02-15 18:15:23 +0000
@@ -574,7 +574,7 @@
 	defer C.free(unsafe.Pointer(cpath))
 
 	var cstat Stat
-	rc, cerr := C.zoo_wexists(conn.handle, cpath, nil, nil, &stat.c)
+	rc, cerr := C.zoo_wexists(conn.handle, cpath, nil, nil, &cstat.c)
 
 	// We diverge a bit from the usual here: a ZNONODE is not an error
 	// for an exists call, otherwise every Exists call would have to check
 
=== modified file 'zk_test.go'
--- zk_test.go	2012-02-15 17:18:34 +0000
+++ zk_test.go	2012-02-15 18:15:23 +0000
@@ -399,6 +399,7 @@
 
 	stat, err = conn.Exists("/zookeeper")
 	c.Assert(err, IsNil)
+	c.Assert(stat.NumChildren(), Equals, 1)
 }
 
 func (s *S) TestExistsAndWatch(c *C) {