Merge pull request #366 from harshavardhana/pr_out_fix_nil_pointer_dereference_when_err_is_nil

This commit is contained in:
Harshavardhana 2015-03-25 00:37:38 -07:00
commit d909a0e297

View File

@ -48,10 +48,12 @@ func Start(path string) (chan<- string, <-chan error, drivers.Driver) {
// TODO donut driver should be passed in as Start param and driven by config // TODO donut driver should be passed in as Start param and driven by config
var err *iodine.Error var err *iodine.Error
s.donut, err = donut.NewDonut(path) s.donut, err = donut.NewDonut(path)
if err != nil {
err = err.Annotate(map[string]string{"path": path}) err = err.Annotate(map[string]string{"path": path})
if err != nil { if err != nil {
log.Println(err.EmitHumanReadable()) log.Println(err.EmitHumanReadable())
} }
}
go start(ctrlChannel, errorChannel, s) go start(ctrlChannel, errorChannel, s)
return ctrlChannel, errorChannel, s return ctrlChannel, errorChannel, s