From 2463be4dea6b0015485ea5c23d4ba060c228e904 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 17 Mar 2014 19:33:40 +0000 Subject: [PATCH] fix panic in monitor Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) --- container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container.go b/container.go index d48b7da82..42b905a26 100644 --- a/container.go +++ b/container.go @@ -788,7 +788,7 @@ func (container *Container) monitor(callback execdriver.StartCallback) error { utils.Errorf("Error running container: %s", err) } - if container.runtime.srv.IsRunning() { + if container.runtime != nil && container.runtime.srv != nil && container.runtime.srv.IsRunning() { container.State.SetStopped(exitCode) // FIXME: there is a race condition here which causes this to fail during the unit tests.