Merge pull request #86 from sanimej/bugfix

boltDB AtomicDelete fails for non-existent key
2015-10-14 14:55:08 -07:00 · 2015-10-14 14:55:08 -07:00 · 99db1f6a07
commit 99db1f6a07
parent bf2f48aec0 f06f78e638
1 changed files with 3 additions and 0 deletions
--- a/libnetwork/internal/kvstore/boltdb/boltdb.go
+++ b/libnetwork/internal/kvstore/boltdb/boltdb.go
@ -330,6 +330,9 @@ func (b *BoltDB) AtomicDelete(key string, previous *store.KVPair) (bool, error)
 		}

 		val = bucket.Get([]byte(key))
+		if val == nil {
+			return store.ErrKeyNotFound
+		}
 		dbIndex := binary.LittleEndian.Uint64(val[:libkvmetadatalen])
 		if dbIndex != previous.LastIndex {
 			return store.ErrKeyModified