0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #496 from docker/bug

Browse source 
Fix bitsequence set()
This commit is contained in:
Jana Radhakrishnan 2015-09-05 10:57:12 -07:00
commit 225a52c765
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnetwork/bitseq/sequence.go
View file

@ -252,9 +252,8 @@ func (h *Handle) set(ordinal uint32, any bool, release bool) (uint32, error) {
return ret, err
}
// Create a private copy of h and work on it, also copy the current db index
// Create a private copy of h and work on it
nh := h.getCopy()
ci := h.dbIndex
h.Unlock()
nh.head = pushReservation(bytePos, bitPos, nh.head, release)
@ -273,12 +272,9 @@ func (h *Handle) set(ordinal uint32, any bool, release bool) (uint32, error) {
continue
}
// Unless unexpected error, save private copy to local copy
// Previous atomic push was succesfull. Save private copy to local copy
h.Lock()
defer h.Unlock()
if h.dbIndex != ci {
return ret, fmt.Errorf("unexected database index change")
}
h.unselected = nh.unselected
h.head = nh.head
h.dbExists = nh.dbExists