From 0d815d9bb7fd532bccc03016055601b379616d90 Mon Sep 17 00:00:00 2001 From: Yanqiang Miao Date: Wed, 16 Nov 2016 15:31:42 +0800 Subject: [PATCH] Remove redundant 'if' statement Signed-off-by: Yanqiang Miao update Signed-off-by: Yanqiang Miao --- daemon/commit.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/daemon/commit.go b/daemon/commit.go index 85d512ad5f..d0de6c0981 100644 --- a/daemon/commit.go +++ b/daemon/commit.go @@ -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{}{}