Skip to content

Commit

Permalink
Merge pull request go-zookeeper#73 from mailgun/maxim/develop
Browse files Browse the repository at this point in the history
Never reset Conn.xid (fixes go-zookeeper#5)
  • Loading branch information
samuel committed Aug 17, 2015
2 parents 5bb5cfc + 4d82aba commit 01d8ae0
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions zk/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var ErrNoServer = errors.New("zk: could not connect to a server")
var ErrInvalidPath = errors.New("zk: invalid path")

// DefaultLogger uses the stdlib log package for logging.
var DefaultLogger = defaultLogger{}
var DefaultLogger Logger = defaultLogger{}

const (
bufferSize = 1536 * 1024
Expand Down Expand Up @@ -463,9 +463,6 @@ func (c *Conn) authenticate() error {
return ErrSessionExpired
}

if c.sessionID != r.SessionID {
atomic.StoreUint32(&c.xid, 0)
}
c.timeout = r.TimeOut
c.sessionID = r.SessionID
c.passwd = r.Passwd
Expand Down

0 comments on commit 01d8ae0

Please sign in to comment.