vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #235 from xiangli-cmu/0.2 

Test both of the condition if given
release-0.4
Xiang Li 2013-10-14 13:03:02 -07:00
parent 89660ce0cd 2b6c628342
commit 812fd4393e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
store/store.go
View File

@ -180,7 +180,9 @@ func (s *store) TestAndSet(nodePath string, prevValue string, prevIndex uint64,
return nil, etcdErr.NewError(etcdErr.EcodeNotFile, nodePath, index, term)
}
if n.Value == prevValue || n.ModifiedIndex == prevIndex {
// If both of the prevValue and prevIndex are given, we will test both of them.
// Command will be executed, only if both of the tests are successful.
if (prevValue == "" || n.Value == prevValue) && (prevIndex == 0 || n.ModifiedIndex == prevIndex) {
e := newEvent(TestAndSet, nodePath, index, term)
e.PrevValue = n.Value