commands: Fixed panic when trying to marshal without a command set in request

db9c7f7c · Matt Bell · Juan Batiz-Benet · df6c7004 · db9c7f7c
Commit db9c7f7c authored 10 years ago by Matt Bell Committed by Juan Batiz-Benet 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

commands/response.go commands/response.go +4 -1

No files found.
--- a/commands/response.go
+++ b/commands/response.go
@@ -115,7 +115,10 @@ func (r *response) Marshal() ([]byte, error) {
 	}
 	encType := EncodingType(strings.ToLower(encStr))

-	marshaller := r.req.Command().Marshallers[encType]
+	var marshaller Marshaller
+	if r.req.Command() != nil && r.req.Command().Marshallers != nil {
+		marshaller = r.req.Command().Marshallers[encType]
+	}
 	if marshaller == nil {
 		marshaller, ok = marshallers[encType]
 		if !ok {