From: Roger Peppe <rogpeppe@gmail.com>
Date: Mon, 1 Aug 2011 16:02:06 +0000 (-0700)
Subject: exp/template: ensure that a valid Set is returned even on error.
X-Git-Tag: weekly.2011-08-10~50
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5c5ce6d24d766b47791cb4066748e8ef26ecae9a;p=gostls13.git

exp/template: ensure that a valid Set is returned even on error.

R=r
CC=golang-dev
https://golang.org/cl/4838044
---

diff --git a/src/pkg/exp/template/helper.go b/src/pkg/exp/template/helper.go
index 4187897171..440f878745 100644
--- a/src/pkg/exp/template/helper.go
+++ b/src/pkg/exp/template/helper.go
@@ -97,6 +97,7 @@ func (s *Set) ParseFile(filenames ...string) (*Set, os.Error) {
 // named files. Each file must be individually parseable.
 func ParseSetFile(filenames ...string) (*Set, os.Error) {
 	s := new(Set)
+	s.init()
 	for _, filename := range filenames {
 		b, err := ioutil.ReadFile(filename)
 		if err != nil {
@@ -193,6 +194,7 @@ func (s *Set) ParseTemplateFiles(pattern string) (*Set, os.Error) {
 // encountered.
 func ParseTemplateFile(filenames ...string) (*Set, os.Error) {
 	set := new(Set)
+	set.init()
 	for _, filename := range filenames {
 		t, err := ParseFile(filename)
 		if err != nil {
@@ -217,6 +219,7 @@ func ParseTemplateFile(filenames ...string) (*Set, os.Error) {
 // encountered.
 func ParseTemplateFiles(pattern string) (*Set, os.Error) {
 	set := new(Set)
+	set.init()
 	filenames, err := filepath.Glob(pattern)
 	if err != nil {
 		return set, err