1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #4723 from vieux/fix_panic_monitor

fix panic in monitor
This commit is contained in:
Guillaume J. Charmes 2014-03-17 13:52:22 -07:00
commit dd040c9870

View file

@ -797,7 +797,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.