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

Merge pull request #1758 from aboch/nlo2

Browse source 
Do not reset network scope during store read
This commit is contained in:
Madhu Venugopal 2017-05-15 12:50:51 -07:00 • committed by GitHub
commit 89b89862aa
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libnetwork/store.go
View file

@ -98,7 +98,9 @@ func (c *controller) getNetworkFromStore(nid string) (*network, error) {
}
n.epCnt = ec
n.scope = store.Scope()
if n.scope == "" {
n.scope = store.Scope()
}
return n, nil
}
@ -132,7 +134,9 @@ func (c *controller) getNetworksForScope(scope string) ([]*network, error) {
}
n.epCnt = ec
n.scope = scope
if n.scope == "" {
n.scope = scope
}
nl = append(nl, n)
}
@ -171,7 +175,9 @@ func (c *controller) getNetworksFromStore() ([]*network, error) {
ec.n = n
n.epCnt = ec
}
n.scope = store.Scope()
if n.scope == "" {
n.scope = store.Scope()
}
n.Unlock()
nl = append(nl, n)
}