From 92b39790edb920036f0317924781eb447dbbe47e Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Fri, 22 Nov 2013 14:28:49 -0500 Subject: [PATCH] fix the nil pointer panic on closing a disabled network manager Issue #2768 Upstream-commit: ef14aaf627377b24edb55fe2080e10f748c0e444 Component: engine --- components/engine/network.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/engine/network.go b/components/engine/network.go index 3864cca8cd..1397de0557 100644 --- a/components/engine/network.go +++ b/components/engine/network.go @@ -661,6 +661,9 @@ func (manager *NetworkManager) Allocate() (*NetworkInterface, error) { } func (manager *NetworkManager) Close() error { + if manager.disabled { + return nil + } err1 := manager.tcpPortAllocator.Close() err2 := manager.udpPortAllocator.Close() err3 := manager.ipAllocator.Close()