kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

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
parent 0e92c7c24a 1dfc440733
commit dd040c9870
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/container.go
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.