feat test both of the condidtion

release-0.4
Xiang Li 2013-10-14 12:57:35 -07:00
parent ef74464aea
commit c87a7a039e
1 changed files with 3 additions and 1 deletions

View File

@ -162,7 +162,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