From 5b681c96b0315fbb5ffed652df53c07886f0235a Mon Sep 17 00:00:00 2001 From: xianlubird Date: Wed, 6 Jul 2016 17:54:46 +0800 Subject: [PATCH] Change buildEndpointResource params avoid repeat visits resource Signed-off-by: Xianlu --- api/server/router/network/network_routes.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go index ebf2ce2872..0d08ddc156 100644 --- a/api/server/router/network/network_routes.go +++ b/api/server/router/network/network_routes.go @@ -191,12 +191,13 @@ func (n *networkRouter) buildNetworkResource(nw libnetwork.Network) *types.Netwo continue } sb := ei.Sandbox() - key := "ep-" + e.ID() + tmpID := e.ID() + key := "ep-" + tmpID if sb != nil { key = sb.ContainerID() } - r.Containers[key] = buildEndpointResource(e) + r.Containers[key] = buildEndpointResource(tmpID, e.Name(), ei) } return r } @@ -256,15 +257,12 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo) } } -func buildEndpointResource(e libnetwork.Endpoint) types.EndpointResource { +func buildEndpointResource(id string, name string, info libnetwork.EndpointInfo) types.EndpointResource { er := types.EndpointResource{} - if e == nil { - return er - } - er.EndpointID = e.ID() - er.Name = e.Name() - ei := e.Info() + er.EndpointID = id + er.Name = name + ei := info if ei == nil { return er }