docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21677 from aaronlehmann/layer-store-locking 

Fix layer store Get locking
This commit is contained in:
Antonio Murdaca 2016-03-31 11:35:02 +02:00
parent f4b915ad7d 0538981c31
commit 156c5db889
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
layer/layer_store.go
View File

@ -334,7 +334,10 @@ func (ls *layerStore) get(l ChainID) *roLayer {
} }
func (ls *layerStore) Get(l ChainID) (Layer, error) { func (ls *layerStore) Get(l ChainID) (Layer, error) {
layer := ls.get(l) ls.layerL.Lock()
defer ls.layerL.Unlock()
layer := ls.getWithoutLock(l)
if layer == nil { if layer == nil {
return nil, ErrLayerDoesNotExist return nil, ErrLayerDoesNotExist
} }