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

Merge pull request #28467 from miaoyq/del-redundant-logical-judgmont-statement

Browse source 
Remove redundant 'if' statement
This commit is contained in:
Doug Davis 2016-11-16 11:34:40 -05:00 • committed by GitHub
commit 4dff538118
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/commit.go
View file

@ -17,7 +17,6 @@ import (
"github.com/docker/docker/layer"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/reference"
"github.com/docker/go-connections/nat"
)
// merge merges two Config, the image container configuration (defaults values),
@ -32,9 +31,6 @@ func merge(userConf, imageConf *containertypes.Config) error {
if len(userConf.ExposedPorts) == 0 {
userConf.ExposedPorts = imageConf.ExposedPorts
} else if imageConf.ExposedPorts != nil {
if userConf.ExposedPorts == nil {
userConf.ExposedPorts = make(nat.PortSet)
}
for port := range imageConf.ExposedPorts {
if _, exists := userConf.ExposedPorts[port]; !exists {
userConf.ExposedPorts[port] = struct{}{}