p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11162 from SvenDowideit/if-nil-call-with-nil

Browse Source 
Seems like an un-necessary if statement
Upstream-commit: 5035fa1e21947bfd229639c5c83c89d6bda0a1a9
Component: engine
This commit is contained in:
Alexander Morozov
2015-03-04 13:59:27 -08:00
parent e708804317 8d2cefd5a5
commit cc537ac671
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/daemon/networkdriver/bridge/driver.go
View File

@ -508,11 +508,7 @@ func Allocate(job *engine.Job) engine.Status {
globalIPv6 net.IP
)
if requestedIP != nil {
ip, err = ipallocator.RequestIP(bridgeIPv4Network, requestedIP)
} else {
ip, err = ipallocator.RequestIP(bridgeIPv4Network, nil)
}
ip, err = ipallocator.RequestIP(bridgeIPv4Network, requestedIP)
if err != nil {
return job.Error(err)
}