From c85a58b6df38c692275d592049d1b2db1d1b4da3 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Sat, 13 Jun 2015 14:28:34 -0700 Subject: [PATCH] Return an empty config if nil Since the Config is a read-only entity, Confg() method returned a value instead of the pointer. In cases the config is nil, we should return an empty config. Signed-off-by: Madhu Venugopal --- libnetwork/controller.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libnetwork/controller.go b/libnetwork/controller.go index 06db0bf49d..2f41bac5e8 100644 --- a/libnetwork/controller.go +++ b/libnetwork/controller.go @@ -169,6 +169,9 @@ func (c *controller) hostLeaveCallback(hosts []net.IP) { func (c *controller) Config() config.Config { c.Lock() defer c.Unlock() + if c.cfg == nil { + return config.Config{} + } return *c.cfg }