From 8801bdf2b3cb8f3d59664f56fba7eeb7a2cf0bdb Mon Sep 17 00:00:00 2001 From: Aamir Khan Date: Tue, 19 May 2015 13:49:53 +0900 Subject: text/template: template must be initialized at the time of creation t.init() should be called at the time of template creation i.e, template.New() and t.New() instead of later in the process. - Removed calls of t.init() from t.Parse(), t.Execute(), t.Funcs() - Also got rid of t.common != nil checks as it should never be nil Fixes #10879 Change-Id: I1b7ac812f02c841ae80037babce7e2b0a2df13e8 Reviewed-on: https://go-review.googlesource.com/10240 Reviewed-by: Rob Pike --- src/text/template/exec.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/text/template/exec.go') diff --git a/src/text/template/exec.go b/src/text/template/exec.go index ebafb4b5dc..b4e6cc8282 100644 --- a/src/text/template/exec.go +++ b/src/text/template/exec.go @@ -134,7 +134,6 @@ func (t *Template) Execute(wr io.Writer, data interface{}) (err error) { wr: wr, vars: []variable{{"$", value}}, } - t.init() if t.Tree == nil || t.Root == nil { state.errorf("%q is an incomplete or empty template%s", t.Name(), t.DefinedTemplates()) } @@ -147,9 +146,6 @@ func (t *Template) Execute(wr io.Writer, data interface{}) (err error) { // it returns the empty string. For generating an error message here // and in html/template. func (t *Template) DefinedTemplates() string { - if t.common == nil { - return "" - } var b bytes.Buffer for name, tmpl := range t.tmpl { if tmpl.Tree == nil || tmpl.Root == nil { -- cgit v1.3