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

Merge pull request #1687 from vieux/fix_filter_network_global 

fix network filter with global network
This commit is contained in:
Dongluo Chen 2016-01-27 11:35:10 -08:00
parent 6b451b2d8c 4194778242
commit 2f5b1a8d4d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/network.go
View File

@ -65,7 +65,7 @@ func (networks Networks) Get(IDOrName string) *Network {
} }
} }
candidates := []*Network{} candidates := Networks{}
// Match name or engine/name. // Match name or engine/name.
for _, network := range networks { for _, network := range networks {
@ -75,7 +75,7 @@ func (networks Networks) Get(IDOrName string) *Network {
} }
// Return if we found a unique match. // Return if we found a unique match.
if size := len(candidates); size == 1 { if size := len(candidates.Uniq()); size == 1 {
return candidates[0] return candidates[0]
} else if size > 1 { } else if size > 1 {
return nil return nil
@ -95,7 +95,7 @@ func (networks Networks) Get(IDOrName string) *Network {
} }
} }
if len(candidates) == 1 { if len(candidates.Uniq()) == 1 {
return candidates[0] return candidates[0]
} }