浏览代码

Nil check ingressSandbox before deleting

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Jana Radhakrishnan 9 年之前
父节点
当前提交
9041996509
共有 1 个文件被更改,包括 7 次插入4 次删除
  1. 7 4
      libnetwork/controller.go

+ 7 - 4
libnetwork/controller.go

@@ -320,14 +320,17 @@ func (c *controller) clusterAgentInit() {
 			c.agentClose()
 			c.agentClose()
 			c.cleanupServiceBindings("")
 			c.cleanupServiceBindings("")
 
 
-			if err := c.ingressSandbox.Delete(); err != nil {
-				log.Warnf("Could not delete ingress sandbox while leaving: %v", err)
-			}
-
 			c.Lock()
 			c.Lock()
+			ingressSandbox := c.ingressSandbox
 			c.ingressSandbox = nil
 			c.ingressSandbox = nil
 			c.Unlock()
 			c.Unlock()
 
 
+			if ingressSandbox != nil {
+				if err := ingressSandbox.Delete(); err != nil {
+					log.Warnf("Could not delete ingress sandbox while leaving: %v", err)
+				}
+			}
+
 			n, err := c.NetworkByName("ingress")
 			n, err := c.NetworkByName("ingress")
 			if err != nil {
 			if err != nil {
 				log.Warnf("Could not find ingress network while leaving: %v", err)
 				log.Warnf("Could not find ingress network while leaving: %v", err)