Parcourir la source

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

Seems like an un-necessary if statement
Alexander Morozov il y a 10 ans
Parent
commit
5035fa1e21
1 fichiers modifiés avec 1 ajouts et 5 suppressions
  1. 1 5
      daemon/networkdriver/bridge/driver.go

+ 1 - 5
daemon/networkdriver/bridge/driver.go

@@ -508,11 +508,7 @@ func Allocate(job *engine.Job) engine.Status {
 		globalIPv6    net.IP
 		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 {
 	if err != nil {
 		return job.Error(err)
 		return job.Error(err)
 	}
 	}