Merge 8448dce into e670e4d

uber · Nov 7, 2019 · a1e69d3 · a1e69d3
2 parents e670e4d + 8448dce
commit a1e69d3
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 71 deletions.
diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/tchannel_client.tmpl b/codegen/templates/tchannel_client.tmpl
@@ -257,7 +257,7 @@ type {{$clientName}} struct {
 		{{end -}}
 
 		var success bool
-		var respHeaders map[string]string
+		respHeaders := map[string]string{}
 		var err error
 		if (c.circuitBreakerDisabled) {
 			success, respHeaders, err = c.client.Call(
@@ -286,9 +286,9 @@ type {{$clientName}} struct {
 		if err != nil {
 			logger.Warn("Client failure: TChannel client call returned error", zap.Error(err))
 		{{if eq .ResponseType "" -}}
-			return nil, err
+			return respHeaders, err
 		{{else -}}
-			return resp, nil, err
+			return resp, respHeaders, err
 		{{end -}}
 		}