kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Do not reset network scope during store read 

- Unless it is needed

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2017-05-15 11:48:05 -07:00
parent 57b1bb6069
commit f626582c16
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)
}